From c335a0cf60f11ba1ce8ef9362a4f2f2abd79a232 Mon Sep 17 00:00:00 2001
From: Zied <26070035+zguesmi@users.noreply.github.com>
Date: Tue, 1 Sep 2026 14:51:37 +0200
Subject: [PATCH 01/17] refactor: convert IexecPocoCommon to the DealVolumeLib
 library

The abstract contract was a stateless helper over diamond storage that
used nothing from FacetBase, so inheriting it forced three facets into a
base they did not need. A library expresses the same thing without the
inheritance edge, and `internal` library functions are inlined, so the
call sites keep their previous cost.

The function loses its leading underscore, which marked it as internal to
a contract and means nothing in a library. The two `using IexecLibOrders_v5`
directives were unreferenced and are dropped.

No ABI change: the contract exported no ABI entries, having only internal
members.
---
 contracts/facets/IexecPoco1Facet.sol          | 12 +++-------
 contracts/facets/IexecPocoAccessorsFacet.sol  |  6 ++---
 contracts/facets/IexecPocoBoostFacet.sol      |  6 ++---
 .../DealVolumeLib.sol}                        | 22 ++++++++-----------
 4 files changed, 18 insertions(+), 28 deletions(-)
 rename contracts/{abstract/IexecPocoCommon.sol => libs/DealVolumeLib.sol} (71%)

diff --git a/contracts/facets/IexecPoco1Facet.sol b/contracts/facets/IexecPoco1Facet.sol
index fc49c5244..f3f024aef 100644
--- a/contracts/facets/IexecPoco1Facet.sol
+++ b/contracts/facets/IexecPoco1Facet.sol
@@ -12,7 +12,7 @@ import {PocoStorageLib} from "../libs/PocoStorageLib.sol";
 import {IexecPoco1} from "../interfaces/IexecPoco1.sol";
 import {IexecPoco1Errors} from "../interfaces/IexecPoco1Errors.sol";
 import {IexecEscrow} from "../abstract/IexecEscrow.sol";
-import {IexecPocoCommon} from "../abstract/IexecPocoCommon.sol";
+import {DealVolumeLib} from "../libs/DealVolumeLib.sol";
 import {SignatureVerifier} from "../abstract/SignatureVerifier.sol";
 
 struct Matching {
@@ -26,13 +26,7 @@ struct Matching {
     bool hasDataset;
 }
 
-contract IexecPoco1Facet is
-    IexecPoco1,
-    IexecPoco1Errors,
-    IexecEscrow,
-    SignatureVerifier,
-    IexecPocoCommon
-{
+contract IexecPoco1Facet is IexecPoco1, IexecPoco1Errors, IexecEscrow, SignatureVerifier {
     using Math for uint256;
     using IexecLibOrders_v5 for IexecLibOrders_v5.AppOrder;
     using IexecLibOrders_v5 for IexecLibOrders_v5.DatasetOrder;
@@ -379,7 +373,7 @@ contract IexecPoco1Facet is
         /**
          * Check availability
          */
-        uint256 volume = _computeDealVolume(
+        uint256 volume = DealVolumeLib.computeDealVolume(
             _apporder.volume,
             ids.apporderHash,
             ids.hasDataset,
diff --git a/contracts/facets/IexecPocoAccessorsFacet.sol b/contracts/facets/IexecPocoAccessorsFacet.sol
index 1a8a5b40e..d22dbc59c 100644
--- a/contracts/facets/IexecPocoAccessorsFacet.sol
+++ b/contracts/facets/IexecPocoAccessorsFacet.sol
@@ -11,13 +11,13 @@ import {IApp} from "../registries/apps/IApp.v8.sol";
 import {IWorkerpool} from "../registries/workerpools/IWorkerpool.v8.sol";
 import {IexecPocoAccessors} from "../interfaces/IexecPocoAccessors.sol";
 import {IRegistry} from "../registries/IRegistry.sol";
-import {IexecPocoCommon} from "../abstract/IexecPocoCommon.sol";
+import {DealVolumeLib} from "../libs/DealVolumeLib.sol";
 import {SignatureVerifier} from "../abstract/SignatureVerifier.sol";
 
 /**
  * @title Getters contract for PoCo facets.
  */
-contract IexecPocoAccessorsFacet is IexecPocoAccessors, SignatureVerifier, IexecPocoCommon {
+contract IexecPocoAccessorsFacet is IexecPocoAccessors, SignatureVerifier {
     using IexecLibOrders_v5 for IexecLibOrders_v5.AppOrder;
     using IexecLibOrders_v5 for IexecLibOrders_v5.DatasetOrder;
     using IexecLibOrders_v5 for IexecLibOrders_v5.WorkerpoolOrder;
@@ -60,7 +60,7 @@ contract IexecPocoAccessorsFacet is IexecPocoAccessors, SignatureVerifier, Iexec
         IexecLibOrders_v5.RequestOrder calldata requestOrder
     ) external view override returns (uint256) {
         return
-            _computeDealVolume(
+            DealVolumeLib.computeDealVolume(
                 appOrder.volume,
                 _toTypedDataHash(appOrder.hash()),
                 datasetOrder.dataset != address(0),
diff --git a/contracts/facets/IexecPocoBoostFacet.sol b/contracts/facets/IexecPocoBoostFacet.sol
index e7b5d5b10..94a671e4c 100644
--- a/contracts/facets/IexecPocoBoostFacet.sol
+++ b/contracts/facets/IexecPocoBoostFacet.sol
@@ -15,7 +15,7 @@ import {IexecLibOrders_v5} from "../libs/IexecLibOrders_v5.sol";
 import {IWorkerpool} from "../registries/workerpools/IWorkerpool.v8.sol";
 import {IexecPocoBoost} from "../interfaces/IexecPocoBoost.sol";
 import {IexecEscrow} from "../abstract/IexecEscrow.sol";
-import {IexecPocoCommon} from "../abstract/IexecPocoCommon.sol";
+import {DealVolumeLib} from "../libs/DealVolumeLib.sol";
 import {PocoStorageLib} from "../libs/PocoStorageLib.sol";
 import {SignatureVerifier} from "../abstract/SignatureVerifier.sol";
 
@@ -27,7 +27,7 @@ import {SignatureVerifier} from "../abstract/SignatureVerifier.sol";
  * @title PoCo Boost to reduce latency and increase throughput of deals.
  * @notice Works for deals with requested trust = 0.
  */
-contract IexecPocoBoostFacet is IexecPocoBoost, IexecEscrow, SignatureVerifier, IexecPocoCommon {
+contract IexecPocoBoostFacet is IexecPocoBoost, IexecEscrow, SignatureVerifier {
     using ECDSA for bytes32;
     using MessageHashUtils for bytes32;
     using Math for uint256;
@@ -268,7 +268,7 @@ contract IexecPocoBoostFacet is IexecPocoBoost, IexecEscrow, SignatureVerifier,
          *   - but trying to use as little gas as possible
          * - Overflows: Solidity 0.8 has built in overflow checking
          */
-        uint256 volume = _computeDealVolume(
+        uint256 volume = DealVolumeLib.computeDealVolume(
             appOrder.volume,
             appOrderTypedDataHash,
             hasDataset,
diff --git a/contracts/abstract/IexecPocoCommon.sol b/contracts/libs/DealVolumeLib.sol
similarity index 71%
rename from contracts/abstract/IexecPocoCommon.sol
rename to contracts/libs/DealVolumeLib.sol
index ca596aade..8fb63289e 100644
--- a/contracts/abstract/IexecPocoCommon.sol
+++ b/contracts/libs/DealVolumeLib.sol
@@ -4,22 +4,18 @@
 pragma solidity ^0.8.0;
 
 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";
+import {PocoStorageLib} from "./PocoStorageLib.sol";
 
-// TODO convert to library
-abstract contract IexecPocoCommon is FacetBase {
+/**
+ * @title Compute the volume of a deal from the volumes of the orders it matches.
+ */
+library DealVolumeLib {
     using Math for uint256;
-    using IexecLibOrders_v5 for IexecLibOrders_v5.AppOrder;
-    using IexecLibOrders_v5 for IexecLibOrders_v5.DatasetOrder;
-    using IexecLibOrders_v5 for IexecLibOrders_v5.WorkerpoolOrder;
-    using IexecLibOrders_v5 for IexecLibOrders_v5.RequestOrder;
 
     /**
-     * @notice Internal function to compute the deal volume considering the minimum
-     * remaining volume across all provided orders. This ensures that the deal volume
-     * does not exceed the available volume of any individual order.
+     * @notice Compute the deal volume considering the minimum remaining volume
+     * across all provided orders. This ensures that the deal volume does not
+     * exceed the available volume of any individual order.
      *
      * @param appOrderVolume The volume of the app order.
      * @param appOrderTypedDataHash The typed data hash of the app order.
@@ -32,7 +28,7 @@ abstract contract IexecPocoCommon is FacetBase {
      * @param requestOrderTypedDataHash The typed data hash of the request order.
      * @return The minimum volume available across all orders.
      */
-    function _computeDealVolume(
+    function computeDealVolume(
         uint256 appOrderVolume,
         bytes32 appOrderTypedDataHash,
         bool hasDataset,

From 83eb716d45cdba29825996bde50277553e66e12b Mon Sep 17 00:00:00 2001
From: Zied <26070035+zguesmi@users.noreply.github.com>
Date: Tue, 1 Sep 2026 14:54:25 +0200
Subject: [PATCH 02/17] refactor: convert SignatureVerifier to the
 SignatureVerificationLib library

Like the deal volume helper, the abstract contract was a stateless helper
over diamond storage and imposed itself as a base on five facets. A
library removes that inheritance edge; `internal` library functions are
inlined, so the 66 call sites keep their previous cost.

The one member it did take from FacetBase, the GROUPMEMBER_PURPOSE
constant, is redeclared in the library, since a library cannot inherit.
The functions lose their leading underscores, which marked them as
internal to a contract and mean nothing in a library.

IexecPocoAccessorsFacet and IexecOrderManagementFacet reached FacetBase
only through SignatureVerifier and use it (the deadline ratios, the kitty
constants, _msgSender), so they now declare it directly. The other three
facets still reach it through IexecEscrow.

No ABI change: the contract exported no ABI entries, having only internal
members.
---
 .../facets/IexecOrderManagementFacet.sol      | 37 +++++---
 contracts/facets/IexecPoco1Facet.sol          | 88 +++++++++++++------
 contracts/facets/IexecPoco2Facet.sol          | 12 +--
 contracts/facets/IexecPocoAccessorsFacet.sol  | 13 +--
 contracts/facets/IexecPocoBoostFacet.sol      | 88 ++++++++++++++-----
 .../SignatureVerificationLib.sol}             | 33 +++----
 6 files changed, 179 insertions(+), 92 deletions(-)
 rename contracts/{abstract/SignatureVerifier.sol => libs/SignatureVerificationLib.sol} (87%)

diff --git a/contracts/facets/IexecOrderManagementFacet.sol b/contracts/facets/IexecOrderManagementFacet.sol
index aac00b7da..5fc77af9b 100644
--- a/contracts/facets/IexecOrderManagementFacet.sol
+++ b/contracts/facets/IexecOrderManagementFacet.sol
@@ -4,12 +4,13 @@
 pragma solidity ^0.8.0;
 
 import {IERC5313} from "@openzeppelin/contracts/interfaces/IERC5313.sol";
-import {SignatureVerifier} from "../abstract/SignatureVerifier.sol";
+import {FacetBase} from "../abstract/FacetBase.sol";
+import {SignatureVerificationLib} from "../libs/SignatureVerificationLib.sol";
 import {IexecOrderManagement} from "../interfaces/IexecOrderManagement.sol";
 import {PocoStorageLib} from "../libs/PocoStorageLib.sol";
 import {IexecLibOrders_v5} from "../libs/IexecLibOrders_v5.sol";
 
-contract IexecOrderManagementFacet is IexecOrderManagement, SignatureVerifier {
+contract IexecOrderManagementFacet is IexecOrderManagement, FacetBase {
     using IexecLibOrders_v5 for IexecLibOrders_v5.AppOrder;
     using IexecLibOrders_v5 for IexecLibOrders_v5.DatasetOrder;
     using IexecLibOrders_v5 for IexecLibOrders_v5.WorkerpoolOrder;
@@ -29,15 +30,17 @@ contract IexecOrderManagementFacet is IexecOrderManagement, SignatureVerifier {
         address owner = IERC5313(_apporderoperation.order.app).owner();
         require(
             owner == _msgSender() ||
-                _verifySignature(
+                SignatureVerificationLib.verifySignature(
                     owner,
-                    _toTypedDataHash(_apporderoperation.hash()),
+                    SignatureVerificationLib.toTypedDataHash(_apporderoperation.hash()),
                     _apporderoperation.sign
                 ),
             "invalid-sender-or-signature"
         );
 
-        bytes32 apporderHash = _toTypedDataHash(_apporderoperation.order.hash());
+        bytes32 apporderHash = SignatureVerificationLib.toTypedDataHash(
+            _apporderoperation.order.hash()
+        );
         if (_apporderoperation.operation == IexecLibOrders_v5.OrderOperationEnum.SIGN) {
             $.m_presigned[apporderHash] = owner;
             emit SignedAppOrder(apporderHash);
@@ -54,15 +57,17 @@ contract IexecOrderManagementFacet is IexecOrderManagement, SignatureVerifier {
         address owner = IERC5313(_datasetorderoperation.order.dataset).owner();
         require(
             owner == _msgSender() ||
-                _verifySignature(
+                SignatureVerificationLib.verifySignature(
                     owner,
-                    _toTypedDataHash(_datasetorderoperation.hash()),
+                    SignatureVerificationLib.toTypedDataHash(_datasetorderoperation.hash()),
                     _datasetorderoperation.sign
                 ),
             "invalid-sender-or-signature"
         );
 
-        bytes32 datasetorderHash = _toTypedDataHash(_datasetorderoperation.order.hash());
+        bytes32 datasetorderHash = SignatureVerificationLib.toTypedDataHash(
+            _datasetorderoperation.order.hash()
+        );
         if (_datasetorderoperation.operation == IexecLibOrders_v5.OrderOperationEnum.SIGN) {
             $.m_presigned[datasetorderHash] = owner;
             emit SignedDatasetOrder(datasetorderHash);
@@ -79,15 +84,17 @@ contract IexecOrderManagementFacet is IexecOrderManagement, SignatureVerifier {
         address owner = IERC5313(_workerpoolorderoperation.order.workerpool).owner();
         require(
             owner == _msgSender() ||
-                _verifySignature(
+                SignatureVerificationLib.verifySignature(
                     owner,
-                    _toTypedDataHash(_workerpoolorderoperation.hash()),
+                    SignatureVerificationLib.toTypedDataHash(_workerpoolorderoperation.hash()),
                     _workerpoolorderoperation.sign
                 ),
             "invalid-sender-or-signature"
         );
 
-        bytes32 workerpoolorderHash = _toTypedDataHash(_workerpoolorderoperation.order.hash());
+        bytes32 workerpoolorderHash = SignatureVerificationLib.toTypedDataHash(
+            _workerpoolorderoperation.order.hash()
+        );
         if (_workerpoolorderoperation.operation == IexecLibOrders_v5.OrderOperationEnum.SIGN) {
             $.m_presigned[workerpoolorderHash] = owner;
             emit SignedWorkerpoolOrder(workerpoolorderHash);
@@ -106,15 +113,17 @@ contract IexecOrderManagementFacet is IexecOrderManagement, SignatureVerifier {
         address owner = _requestorderoperation.order.requester;
         require(
             owner == _msgSender() ||
-                _verifySignature(
+                SignatureVerificationLib.verifySignature(
                     owner,
-                    _toTypedDataHash(_requestorderoperation.hash()),
+                    SignatureVerificationLib.toTypedDataHash(_requestorderoperation.hash()),
                     _requestorderoperation.sign
                 ),
             "invalid-sender-or-signature"
         );
 
-        bytes32 requestorderHash = _toTypedDataHash(_requestorderoperation.order.hash());
+        bytes32 requestorderHash = SignatureVerificationLib.toTypedDataHash(
+            _requestorderoperation.order.hash()
+        );
         if (_requestorderoperation.operation == IexecLibOrders_v5.OrderOperationEnum.SIGN) {
             $.m_presigned[requestorderHash] = owner;
             emit SignedRequestOrder(requestorderHash);
diff --git a/contracts/facets/IexecPoco1Facet.sol b/contracts/facets/IexecPoco1Facet.sol
index f3f024aef..c6eef9b77 100644
--- a/contracts/facets/IexecPoco1Facet.sol
+++ b/contracts/facets/IexecPoco1Facet.sol
@@ -13,7 +13,7 @@ import {IexecPoco1} from "../interfaces/IexecPoco1.sol";
 import {IexecPoco1Errors} from "../interfaces/IexecPoco1Errors.sol";
 import {IexecEscrow} from "../abstract/IexecEscrow.sol";
 import {DealVolumeLib} from "../libs/DealVolumeLib.sol";
-import {SignatureVerifier} from "../abstract/SignatureVerifier.sol";
+import {SignatureVerificationLib} from "../libs/SignatureVerificationLib.sol";
 
 struct Matching {
     bytes32 apporderHash;
@@ -26,7 +26,7 @@ struct Matching {
     bool hasDataset;
 }
 
-contract IexecPoco1Facet is IexecPoco1, IexecPoco1Errors, IexecEscrow, SignatureVerifier {
+contract IexecPoco1Facet is IexecPoco1, IexecPoco1Errors, IexecEscrow {
     using Math for uint256;
     using IexecLibOrders_v5 for IexecLibOrders_v5.AppOrder;
     using IexecLibOrders_v5 for IexecLibOrders_v5.DatasetOrder;
@@ -41,14 +41,14 @@ contract IexecPoco1Facet is IexecPoco1, IexecPoco1Errors, IexecEscrow, Signature
         bytes32 _hash,
         bytes calldata _signature
     ) external view override returns (bool) {
-        return _verifySignature(_identity, _hash, _signature);
+        return SignatureVerificationLib.verifySignature(_identity, _hash, _signature);
     }
 
     function verifyPresignature(
         address _identity,
         bytes32 _hash
     ) external view override returns (bool) {
-        return _verifyPresignature(_identity, _hash);
+        return SignatureVerificationLib.verifyPresignature(_identity, _hash);
     }
 
     function verifyPresignatureOrSignature(
@@ -56,7 +56,7 @@ contract IexecPoco1Facet is IexecPoco1, IexecPoco1Errors, IexecEscrow, Signature
         bytes32 _hash,
         bytes calldata _signature
     ) external view override returns (bool) {
-        return _verifySignatureOrPresignature(_identity, _hash, _signature);
+        return SignatureVerificationLib.verifySignatureOrPresignature(_identity, _hash, _signature);
     }
 
     /**
@@ -79,7 +79,7 @@ contract IexecPoco1Facet is IexecPoco1, IexecPoco1Errors, IexecEscrow, Signature
         bytes32 dealId
     ) external view override {
         PocoStorageLib.PocoStorage storage $ = PocoStorageLib.getPocoStorage();
-        bytes32 datasetOrderHash = _toTypedDataHash(datasetOrder.hash());
+        bytes32 datasetOrderHash = SignatureVerificationLib.toTypedDataHash(datasetOrder.hash());
         // Check if dataset order is not revoked or fully consumed.
         // Note: This should be the first check because it is the most important
         // and the most likely to occur (users revoking their dataset orders).
@@ -88,7 +88,13 @@ contract IexecPoco1Facet is IexecPoco1, IexecPoco1Errors, IexecEscrow, Signature
         }
         // Check dataset order signature (including presign and ERC-1271).
         address datasetOwner = IERC5313(datasetOrder.dataset).owner();
-        if (!_verifySignatureOrPresignature(datasetOwner, datasetOrderHash, datasetOrder.sign)) {
+        if (
+            !SignatureVerificationLib.verifySignatureOrPresignature(
+                datasetOwner,
+                datasetOrderHash,
+                datasetOrder.sign
+            )
+        ) {
             revert IncompatibleDatasetOrder("Invalid dataset order signature");
         }
         // The deal should exist.
@@ -101,12 +107,17 @@ contract IexecPoco1Facet is IexecPoco1, IexecPoco1Errors, IexecEscrow, Signature
             revert IncompatibleDatasetOrder("Deal already has a dataset");
         }
         // The deal's app should be allowed by order restriction.
-        if (!_isAccountAuthorizedByRestriction(datasetOrder.apprestrict, deal.app.pointer)) {
+        if (
+            !SignatureVerificationLib.isAccountAuthorizedByRestriction(
+                datasetOrder.apprestrict,
+                deal.app.pointer
+            )
+        ) {
             revert IncompatibleDatasetOrder("App restriction not satisfied");
         }
         // The deal's workerpool should be allowed by order restriction.
         if (
-            !_isAccountAuthorizedByRestriction(
+            !SignatureVerificationLib.isAccountAuthorizedByRestriction(
                 datasetOrder.workerpoolrestrict,
                 deal.workerpool.pointer
             )
@@ -114,7 +125,12 @@ contract IexecPoco1Facet is IexecPoco1, IexecPoco1Errors, IexecEscrow, Signature
             revert IncompatibleDatasetOrder("Workerpool restriction not satisfied");
         }
         // The deal's requester should be allowed by order restriction.
-        if (!_isAccountAuthorizedByRestriction(datasetOrder.requesterrestrict, deal.requester)) {
+        if (
+            !SignatureVerificationLib.isAccountAuthorizedByRestriction(
+                datasetOrder.requesterrestrict,
+                deal.requester
+            )
+        ) {
             revert IncompatibleDatasetOrder("Requester restriction not satisfied");
         }
         // The deal's tag should include all activated tag bits of the dataset order.
@@ -247,58 +263,70 @@ contract IexecPoco1Facet is IexecPoco1, IexecPoco1Errors, IexecEscrow, Signature
         require(_requestorder.app == _apporder.app, "iExecV5-matchOrders-0x10");
         require(_requestorder.dataset == _datasetorder.dataset, "iExecV5-matchOrders-0x11");
         require(
-            _isAccountAuthorizedByRestriction(
+            SignatureVerificationLib.isAccountAuthorizedByRestriction(
                 _requestorder.workerpool,
                 _workerpoolorder.workerpool
             ),
             "iExecV5-matchOrders-0x12"
         ); // requestorder.workerpool is a restriction
         require(
-            _isAccountAuthorizedByRestriction(_apporder.datasetrestrict, _datasetorder.dataset),
+            SignatureVerificationLib.isAccountAuthorizedByRestriction(
+                _apporder.datasetrestrict,
+                _datasetorder.dataset
+            ),
             "iExecV5-matchOrders-0x13"
         );
         require(
-            _isAccountAuthorizedByRestriction(
+            SignatureVerificationLib.isAccountAuthorizedByRestriction(
                 _apporder.workerpoolrestrict,
                 _workerpoolorder.workerpool
             ),
             "iExecV5-matchOrders-0x14"
         );
         require(
-            _isAccountAuthorizedByRestriction(_apporder.requesterrestrict, _requestorder.requester),
+            SignatureVerificationLib.isAccountAuthorizedByRestriction(
+                _apporder.requesterrestrict,
+                _requestorder.requester
+            ),
             "iExecV5-matchOrders-0x15"
         );
         require(
-            _isAccountAuthorizedByRestriction(_datasetorder.apprestrict, _apporder.app),
+            SignatureVerificationLib.isAccountAuthorizedByRestriction(
+                _datasetorder.apprestrict,
+                _apporder.app
+            ),
             "iExecV5-matchOrders-0x16"
         );
         require(
-            _isAccountAuthorizedByRestriction(
+            SignatureVerificationLib.isAccountAuthorizedByRestriction(
                 _datasetorder.workerpoolrestrict,
                 _workerpoolorder.workerpool
             ),
             "iExecV5-matchOrders-0x17"
         );
         require(
-            _isAccountAuthorizedByRestriction(
+            SignatureVerificationLib.isAccountAuthorizedByRestriction(
                 _datasetorder.requesterrestrict,
                 _requestorder.requester
             ),
             "iExecV5-matchOrders-0x18"
         );
         require(
-            _isAccountAuthorizedByRestriction(_workerpoolorder.apprestrict, _apporder.app),
+            SignatureVerificationLib.isAccountAuthorizedByRestriction(
+                _workerpoolorder.apprestrict,
+                _apporder.app
+            ),
             "iExecV5-matchOrders-0x19"
         );
         require(
-            _isAccountAuthorizedByRestriction(
+            SignatureVerificationLib.isAccountAuthorizedByRestriction(
                 _workerpoolorder.datasetrestrict,
                 _datasetorder.dataset
             ),
             "iExecV5-matchOrders-0x1a"
         );
         require(
-            _isAccountAuthorizedByRestriction(
+            SignatureVerificationLib.isAccountAuthorizedByRestriction(
                 _workerpoolorder.requesterrestrict,
                 _requestorder.requester
             ),
@@ -313,19 +341,23 @@ contract IexecPoco1Facet is IexecPoco1, IexecPoco1Errors, IexecEscrow, Signature
         ids.hasDataset = _datasetorder.dataset != address(0);
 
         // app
-        ids.apporderHash = _toTypedDataHash(_apporder.hash());
+        ids.apporderHash = SignatureVerificationLib.toTypedDataHash(_apporder.hash());
         ids.appOwner = IERC5313(_apporder.app).owner();
 
         require($.m_appregistry.isRegistered(_apporder.app), "iExecV5-matchOrders-0x20");
         require(
-            _verifySignatureOrPresignature(ids.appOwner, ids.apporderHash, _apporder.sign),
+            SignatureVerificationLib.verifySignatureOrPresignature(
+                ids.appOwner,
+                ids.apporderHash,
+                _apporder.sign
+            ),
             "iExecV5-matchOrders-0x21"
         );
 
         // dataset
         if (ids.hasDataset) {
             // only check if dataset is enabled
-            ids.datasetorderHash = _toTypedDataHash(_datasetorder.hash());
+            ids.datasetorderHash = SignatureVerificationLib.toTypedDataHash(_datasetorder.hash());
             ids.datasetOwner = IERC5313(_datasetorder.dataset).owner();
 
             require(
@@ -333,7 +365,7 @@ contract IexecPoco1Facet is IexecPoco1, IexecPoco1Errors, IexecEscrow, Signature
                 "iExecV5-matchOrders-0x30"
             );
             require(
-                _verifySignatureOrPresignature(
+                SignatureVerificationLib.verifySignatureOrPresignature(
                     ids.datasetOwner,
                     ids.datasetorderHash,
                     _datasetorder.sign
@@ -343,7 +375,7 @@ contract IexecPoco1Facet is IexecPoco1, IexecPoco1Errors, IexecEscrow, Signature
         }
 
         // workerpool
-        ids.workerpoolorderHash = _toTypedDataHash(_workerpoolorder.hash());
+        ids.workerpoolorderHash = SignatureVerificationLib.toTypedDataHash(_workerpoolorder.hash());
         ids.workerpoolOwner = IERC5313(_workerpoolorder.workerpool).owner();
 
         require(
@@ -351,7 +383,7 @@ contract IexecPoco1Facet is IexecPoco1, IexecPoco1Errors, IexecEscrow, Signature
             "iExecV5-matchOrders-0x40"
         );
         require(
-            _verifySignatureOrPresignature(
+            SignatureVerificationLib.verifySignatureOrPresignature(
                 ids.workerpoolOwner,
                 ids.workerpoolorderHash,
                 _workerpoolorder.sign
@@ -360,9 +392,9 @@ contract IexecPoco1Facet is IexecPoco1, IexecPoco1Errors, IexecEscrow, Signature
         );
 
         // request
-        ids.requestorderHash = _toTypedDataHash(_requestorder.hash());
+        ids.requestorderHash = SignatureVerificationLib.toTypedDataHash(_requestorder.hash());
         require(
-            _verifySignatureOrPresignature(
+            SignatureVerificationLib.verifySignatureOrPresignature(
                 _requestorder.requester,
                 ids.requestorderHash,
                 _requestorder.sign
diff --git a/contracts/facets/IexecPoco2Facet.sol b/contracts/facets/IexecPoco2Facet.sol
index 9028615e9..70d921867 100644
--- a/contracts/facets/IexecPoco2Facet.sol
+++ b/contracts/facets/IexecPoco2Facet.sol
@@ -10,9 +10,9 @@ import {IexecLibCore_v5} from "../libs/IexecLibCore_v5.sol";
 import {IexecLibOrders_v5} from "../libs/IexecLibOrders_v5.sol";
 import {IexecPoco2} from "../interfaces/IexecPoco2.sol";
 import {IexecEscrow} from "../abstract/IexecEscrow.sol";
-import {SignatureVerifier} from "../abstract/SignatureVerifier.sol";
+import {SignatureVerificationLib} from "../libs/SignatureVerificationLib.sol";
 
-contract IexecPoco2Facet is IexecPoco2, IexecEscrow, SignatureVerifier {
+contract IexecPoco2Facet is IexecPoco2, IexecEscrow {
     modifier onlyScheduler(bytes32 _taskId) {
         PocoStorageLib.PocoStorage storage $ = PocoStorageLib.getPocoStorage();
         require(_msgSender() == $.m_deals[$.m_tasks[_taskId].dealid].workerpool.owner);
@@ -119,7 +119,7 @@ contract IexecPoco2Facet is IexecPoco2, IexecEscrow, SignatureVerifier {
 
         // Check that the worker + taskid + enclave combo is authorized to contribute (scheduler signature)
         require(
-            _verifySignatureOfEthSignedMessage(
+            SignatureVerificationLib.verifySignatureOfEthSignedMessage(
                 (_enclaveChallenge != address(0) && $.m_teebroker != address(0))
                     ? $.m_teebroker
                     : deal.workerpool.owner,
@@ -131,7 +131,7 @@ contract IexecPoco2Facet is IexecPoco2, IexecEscrow, SignatureVerifier {
         // Check enclave signature
         require(
             _enclaveChallenge == address(0) ||
-                _verifySignatureOfEthSignedMessage(
+                SignatureVerificationLib.verifySignatureOfEthSignedMessage(
                     _enclaveChallenge,
                     abi.encodePacked(_resultHash, _resultSeal),
                     _enclaveSign
@@ -206,7 +206,7 @@ contract IexecPoco2Facet is IexecPoco2, IexecEscrow, SignatureVerifier {
 
         // Check that the worker + taskid + enclave combo is authorized to contribute (scheduler signature)
         require(
-            _verifySignatureOfEthSignedMessage(
+            SignatureVerificationLib.verifySignatureOfEthSignedMessage(
                 (_enclaveChallenge != address(0) && $.m_teebroker != address(0))
                     ? $.m_teebroker
                     : deal.workerpool.owner,
@@ -218,7 +218,7 @@ contract IexecPoco2Facet is IexecPoco2, IexecEscrow, SignatureVerifier {
         // Check enclave signature
         require(
             _enclaveChallenge == address(0) ||
-                _verifySignatureOfEthSignedMessage(
+                SignatureVerificationLib.verifySignatureOfEthSignedMessage(
                     _enclaveChallenge,
                     abi.encodePacked(resultHash, resultSeal),
                     _enclaveSign
diff --git a/contracts/facets/IexecPocoAccessorsFacet.sol b/contracts/facets/IexecPocoAccessorsFacet.sol
index d22dbc59c..fa922ee14 100644
--- a/contracts/facets/IexecPocoAccessorsFacet.sol
+++ b/contracts/facets/IexecPocoAccessorsFacet.sol
@@ -12,12 +12,13 @@ import {IWorkerpool} from "../registries/workerpools/IWorkerpool.v8.sol";
 import {IexecPocoAccessors} from "../interfaces/IexecPocoAccessors.sol";
 import {IRegistry} from "../registries/IRegistry.sol";
 import {DealVolumeLib} from "../libs/DealVolumeLib.sol";
-import {SignatureVerifier} from "../abstract/SignatureVerifier.sol";
+import {FacetBase} from "../abstract/FacetBase.sol";
+import {SignatureVerificationLib} from "../libs/SignatureVerificationLib.sol";
 
 /**
  * @title Getters contract for PoCo facets.
  */
-contract IexecPocoAccessorsFacet is IexecPocoAccessors, SignatureVerifier {
+contract IexecPocoAccessorsFacet is IexecPocoAccessors, FacetBase {
     using IexecLibOrders_v5 for IexecLibOrders_v5.AppOrder;
     using IexecLibOrders_v5 for IexecLibOrders_v5.DatasetOrder;
     using IexecLibOrders_v5 for IexecLibOrders_v5.WorkerpoolOrder;
@@ -62,14 +63,14 @@ contract IexecPocoAccessorsFacet is IexecPocoAccessors, SignatureVerifier {
         return
             DealVolumeLib.computeDealVolume(
                 appOrder.volume,
-                _toTypedDataHash(appOrder.hash()),
+                SignatureVerificationLib.toTypedDataHash(appOrder.hash()),
                 datasetOrder.dataset != address(0),
                 datasetOrder.volume,
-                _toTypedDataHash(datasetOrder.hash()),
+                SignatureVerificationLib.toTypedDataHash(datasetOrder.hash()),
                 workerpoolOrder.volume,
-                _toTypedDataHash(workerpoolOrder.hash()),
+                SignatureVerificationLib.toTypedDataHash(workerpoolOrder.hash()),
                 requestOrder.volume,
-                _toTypedDataHash(requestOrder.hash())
+                SignatureVerificationLib.toTypedDataHash(requestOrder.hash())
             );
     }
 
diff --git a/contracts/facets/IexecPocoBoostFacet.sol b/contracts/facets/IexecPocoBoostFacet.sol
index 94a671e4c..af9c5e92a 100644
--- a/contracts/facets/IexecPocoBoostFacet.sol
+++ b/contracts/facets/IexecPocoBoostFacet.sol
@@ -17,7 +17,7 @@ import {IexecPocoBoost} from "../interfaces/IexecPocoBoost.sol";
 import {IexecEscrow} from "../abstract/IexecEscrow.sol";
 import {DealVolumeLib} from "../libs/DealVolumeLib.sol";
 import {PocoStorageLib} from "../libs/PocoStorageLib.sol";
-import {SignatureVerifier} from "../abstract/SignatureVerifier.sol";
+import {SignatureVerificationLib} from "../libs/SignatureVerificationLib.sol";
 
 //
 // Not deployed yet!
@@ -27,7 +27,7 @@ import {SignatureVerifier} from "../abstract/SignatureVerifier.sol";
  * @title PoCo Boost to reduce latency and increase throughput of deals.
  * @notice Works for deals with requested trust = 0.
  */
-contract IexecPocoBoostFacet is IexecPocoBoost, IexecEscrow, SignatureVerifier {
+contract IexecPocoBoostFacet is IexecPocoBoost, IexecEscrow {
     using ECDSA for bytes32;
     using MessageHashUtils for bytes32;
     using Math for uint256;
@@ -161,52 +161,86 @@ contract IexecPocoBoostFacet is IexecPocoBoost, IexecEscrow, SignatureVerifier {
         // Check all possible restrictions.
         address workerpool = workerpoolOrder.workerpool;
         require(
-            _isAccountAuthorizedByRestriction(requestOrder.workerpool, workerpool),
+            SignatureVerificationLib.isAccountAuthorizedByRestriction(
+                requestOrder.workerpool,
+                workerpool
+            ),
             "PocoBoost: Workerpool restricted by request order"
         );
         require(
-            _isAccountAuthorizedByRestriction(appOrder.datasetrestrict, dataset),
+            SignatureVerificationLib.isAccountAuthorizedByRestriction(
+                appOrder.datasetrestrict,
+                dataset
+            ),
             "PocoBoost: Dataset restricted by app order"
         );
         require(
-            _isAccountAuthorizedByRestriction(appOrder.workerpoolrestrict, workerpool),
+            SignatureVerificationLib.isAccountAuthorizedByRestriction(
+                appOrder.workerpoolrestrict,
+                workerpool
+            ),
             "PocoBoost: Workerpool restricted by app order"
         );
         address requester = requestOrder.requester;
         require(
-            _isAccountAuthorizedByRestriction(appOrder.requesterrestrict, requester),
+            SignatureVerificationLib.isAccountAuthorizedByRestriction(
+                appOrder.requesterrestrict,
+                requester
+            ),
             "PocoBoost: Requester restricted by app order"
         );
         require(
-            _isAccountAuthorizedByRestriction(datasetOrder.apprestrict, app),
+            SignatureVerificationLib.isAccountAuthorizedByRestriction(
+                datasetOrder.apprestrict,
+                app
+            ),
             "PocoBoost: App restricted by dataset order"
         );
         require(
-            _isAccountAuthorizedByRestriction(datasetOrder.workerpoolrestrict, workerpool),
+            SignatureVerificationLib.isAccountAuthorizedByRestriction(
+                datasetOrder.workerpoolrestrict,
+                workerpool
+            ),
             "PocoBoost: Workerpool restricted by dataset order"
         );
         require(
-            _isAccountAuthorizedByRestriction(datasetOrder.requesterrestrict, requester),
+            SignatureVerificationLib.isAccountAuthorizedByRestriction(
+                datasetOrder.requesterrestrict,
+                requester
+            ),
             "PocoBoost: Requester restricted by dataset order"
         );
         require(
-            _isAccountAuthorizedByRestriction(workerpoolOrder.apprestrict, app),
+            SignatureVerificationLib.isAccountAuthorizedByRestriction(
+                workerpoolOrder.apprestrict,
+                app
+            ),
             "PocoBoost: App restricted by workerpool order"
         );
         require(
-            _isAccountAuthorizedByRestriction(workerpoolOrder.datasetrestrict, dataset),
+            SignatureVerificationLib.isAccountAuthorizedByRestriction(
+                workerpoolOrder.datasetrestrict,
+                dataset
+            ),
             "PocoBoost: Dataset restricted by workerpool order"
         );
         require(
-            _isAccountAuthorizedByRestriction(workerpoolOrder.requesterrestrict, requester),
+            SignatureVerificationLib.isAccountAuthorizedByRestriction(
+                workerpoolOrder.requesterrestrict,
+                requester
+            ),
             "PocoBoost: Requester restricted by workerpool order"
         );
         // Check ownership, registration, and signatures for app and dataset.
         require($.m_appregistry.isRegistered(app), "PocoBoost: App not registered");
         address appOwner = IERC5313(app).owner();
-        bytes32 appOrderTypedDataHash = _toTypedDataHash(appOrder.hash());
+        bytes32 appOrderTypedDataHash = SignatureVerificationLib.toTypedDataHash(appOrder.hash());
         require(
-            _verifySignatureOrPresignature(appOwner, appOrderTypedDataHash, appOrder.sign),
+            SignatureVerificationLib.verifySignatureOrPresignature(
+                appOwner,
+                appOrderTypedDataHash,
+                appOrder.sign
+            ),
             "PocoBoost: Invalid app order signature"
         );
         bool hasDataset = dataset != address(0);
@@ -215,9 +249,11 @@ contract IexecPocoBoostFacet is IexecPocoBoost, IexecEscrow, SignatureVerifier {
         if (hasDataset) {
             require($.m_datasetregistry.isRegistered(dataset), "PocoBoost: Dataset not registered");
             datasetOwner = IERC5313(dataset).owner();
-            datasetOrderTypedDataHash = _toTypedDataHash(datasetOrder.hash());
+            datasetOrderTypedDataHash = SignatureVerificationLib.toTypedDataHash(
+                datasetOrder.hash()
+            );
             require(
-                _verifySignatureOrPresignature(
+                SignatureVerificationLib.verifySignatureOrPresignature(
                     datasetOwner,
                     datasetOrderTypedDataHash,
                     datasetOrder.sign
@@ -231,18 +267,26 @@ contract IexecPocoBoostFacet is IexecPocoBoost, IexecEscrow, SignatureVerifier {
             "PocoBoost: Workerpool not registered"
         );
         address workerpoolOwner = IERC5313(workerpool).owner();
-        bytes32 workerpoolOrderTypedDataHash = _toTypedDataHash(workerpoolOrder.hash());
+        bytes32 workerpoolOrderTypedDataHash = SignatureVerificationLib.toTypedDataHash(
+            workerpoolOrder.hash()
+        );
         require(
-            _verifySignatureOrPresignature(
+            SignatureVerificationLib.verifySignatureOrPresignature(
                 workerpoolOwner,
                 workerpoolOrderTypedDataHash,
                 workerpoolOrder.sign
             ),
             "PocoBoost: Invalid workerpool order signature"
         );
-        bytes32 requestOrderTypedDataHash = _toTypedDataHash(requestOrder.hash());
+        bytes32 requestOrderTypedDataHash = SignatureVerificationLib.toTypedDataHash(
+            requestOrder.hash()
+        );
         require(
-            _verifySignatureOrPresignature(requester, requestOrderTypedDataHash, requestOrder.sign),
+            SignatureVerificationLib.verifySignatureOrPresignature(
+                requester,
+                requestOrderTypedDataHash,
+                requestOrder.sign
+            ),
             "PocoBoost: Invalid request order signature"
         );
 
@@ -394,7 +438,7 @@ contract IexecPocoBoostFacet is IexecPocoBoost, IexecEscrow, SignatureVerifier {
         address workerpoolOwner = deal.workerpoolOwner;
         // Check scheduler or TEE broker signature
         require(
-            _verifySignatureOfEthSignedMessage(
+            SignatureVerificationLib.verifySignatureOfEthSignedMessage(
                 enclaveChallenge != address(0) && $.m_teebroker != address(0)
                     ? $.m_teebroker
                     : workerpoolOwner,
@@ -407,7 +451,7 @@ contract IexecPocoBoostFacet is IexecPocoBoost, IexecEscrow, SignatureVerifier {
         // Check enclave signature
         require(
             enclaveChallenge == address(0) ||
-                _verifySignatureOfEthSignedMessage(
+                SignatureVerificationLib.verifySignatureOfEthSignedMessage(
                     enclaveChallenge,
                     abi.encodePacked(
                         msg.sender,
diff --git a/contracts/abstract/SignatureVerifier.sol b/contracts/libs/SignatureVerificationLib.sol
similarity index 87%
rename from contracts/abstract/SignatureVerifier.sol
rename to contracts/libs/SignatureVerificationLib.sol
index b7d9e2211..726c08f7a 100644
--- a/contracts/abstract/SignatureVerifier.sol
+++ b/contracts/libs/SignatureVerificationLib.sol
@@ -6,19 +6,23 @@ pragma solidity ^0.8.0;
 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";
+import {PocoStorageLib} from "./PocoStorageLib.sol";
 
-// TODO convert to library
-abstract contract SignatureVerifier is FacetBase {
+/**
+ * @title Verify order and contribution signatures, presignatures and restrictions.
+ */
+library SignatureVerificationLib {
     using ECDSA for bytes32;
 
+    // Used with ERC-734 Key Manager identity contract for authorization management.
+    uint256 private constant GROUPMEMBER_PURPOSE = 4;
+
     /**
      * Hash a Typed Data using the configured domain.
      * @param structHash The original structure hash.
      */
-    function _toTypedDataHash(bytes32 structHash) internal view returns (bytes32) {
+    function toTypedDataHash(bytes32 structHash) internal view returns (bytes32) {
         PocoStorageLib.PocoStorage storage $ = PocoStorageLib.getPocoStorage();
         return MessageHashUtils.toTypedDataHash($.m_eip712DomainSeparator, structHash);
     }
@@ -29,13 +33,13 @@ abstract contract SignatureVerifier is FacetBase {
      * @param message The original message that was signed.
      * @param signature The signature to be verified.
      */
-    function _verifySignatureOfEthSignedMessage(
+    function verifySignatureOfEthSignedMessage(
         address account,
         bytes memory message,
         bytes calldata signature
     ) internal view returns (bool) {
         return
-            _verifySignature(
+            verifySignature(
                 account,
                 MessageHashUtils.toEthSignedMessageHash(keccak256(message)),
                 signature
@@ -54,7 +58,7 @@ abstract contract SignatureVerifier is FacetBase {
      * @param messageHash The message hash that was signed.
      * @param signature The signature to be verified.
      */
-    function _verifySignature(
+    function verifySignature(
         address account,
         bytes32 messageHash,
         bytes calldata signature
@@ -88,10 +92,7 @@ abstract contract SignatureVerifier is FacetBase {
      * @param account The expected presigner account.
      * @param messageHash The message hash that was presigned.
      */
-    function _verifyPresignature(
-        address account,
-        bytes32 messageHash
-    ) internal view returns (bool) {
+    function verifyPresignature(address account, bytes32 messageHash) internal view returns (bool) {
         PocoStorageLib.PocoStorage storage $ = PocoStorageLib.getPocoStorage();
         return account != address(0) && account == $.m_presigned[messageHash];
     }
@@ -102,14 +103,14 @@ abstract contract SignatureVerifier is FacetBase {
      * @param messageHash The message hash that was signed or presigned.
      * @param signature The signature to be verified. Not required for a presignature.
      */
-    function _verifySignatureOrPresignature(
+    function verifySignatureOrPresignature(
         address account,
         bytes32 messageHash,
         bytes calldata signature
     ) internal view returns (bool) {
         return
-            _verifyPresignature(account, messageHash) ||
-            _verifySignature(account, messageHash, signature);
+            verifyPresignature(account, messageHash) ||
+            verifySignature(account, messageHash, signature);
     }
 
     /**
@@ -129,7 +130,7 @@ abstract contract SignatureVerifier is FacetBase {
      * that might whitelist a given address in a group.
      * @param account An address to be checked.
      */
-    function _isAccountAuthorizedByRestriction(
+    function isAccountAuthorizedByRestriction(
         address restriction,
         address account
     ) internal view returns (bool) {

From dea53ef58ac5be0084b9167d256b611199a850c5 Mon Sep 17 00:00:00 2001
From: Zied <26070035+zguesmi@users.noreply.github.com>
Date: Tue, 1 Sep 2026 14:56:56 +0200
Subject: [PATCH 03/17] chore: point the docgen exclusions and the architecture
 note at the new libraries

The two converted helpers moved out of `contracts/abstract/`, so the
docgen exclude list named files that no longer exist. Both libraries are
still excluded for the same reason as before: they expose only internal
members, so they would document nothing.
---
 .agents/context/architecture.md | 2 +-
 hardhat.config.ts               | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.agents/context/architecture.md b/.agents/context/architecture.md
index b1c3b2f2e..3080c517d 100644
--- a/.agents/context/architecture.md
+++ b/.agents/context/architecture.md
@@ -7,7 +7,7 @@
 -   Protocol logic: `contracts/facets/*Facet.sol`
 -   External API declarations: `contracts/interfaces/`
 -   `contracts/IexecInterfaceToken.sol` aggregates them into the single interface downstream tools compile against
--   Shared helpers: `contracts/abstract/` (`FacetBase`, `IexecPocoCommon`, `SignatureVerifier`, …)
+-   Shared helpers: `contracts/abstract/` for inherited bases (`FacetBase`, `IexecEscrow`) and `contracts/libs/` for stateless helper libraries (`DealVolumeLib`, `SignatureVerificationLib`, …)
 -   Storage lives in one struct accessed through `contracts/libs/PocoStorageLib.sol`, shared by every facet: **never reorder or remove an existing variable, only append**. `npm run check-storage-layout` is the CI gate.
 -   Adding or removing a facet means editing two hand-maintained lists: `utils/proxy-tools.ts#getAllLocalFacetFunctions` (selector-to-name map used by upgrades) and the facet groups in `scripts/tools/sol-to-uml.mjs`.
 
diff --git a/hardhat.config.ts b/hardhat.config.ts
index da827a4ec..439dc6b69 100644
--- a/hardhat.config.ts
+++ b/hardhat.config.ts
@@ -166,12 +166,12 @@ const config: HardhatUserConfig = {
         outputDir: 'docs/solidity',
         templates: 'docs/solidity/templates',
         exclude: [
-            'abstract/IexecPocoCommon.sol', // contains only internal/private
-            'abstract/SignatureVerifier.sol', // contains only internal/private
             'external/',
             'facets/IexecAccessorsABILegacyFacet.sol', // not relevant
             // TODO: put all events and soldoc inside interfaces and use them instead of contracts.
             'interfaces/', // interesting for events but too much doc duplication if enabled
+            'libs/DealVolumeLib.sol', // contains only internal/private
+            'libs/SignatureVerificationLib.sol', // contains only internal/private
             'tools/',
             'Diamond.sol', // not relevant
         ],

From 536364b567d5d741904b46f63d983a21e520cc6b Mon Sep 17 00:00:00 2001
From: Zied <26070035+zguesmi@users.noreply.github.com>
Date: Tue, 1 Sep 2026 15:13:45 +0200
Subject: [PATCH 04/17] refactor: rename SignatureVerificationLib to
 SignatureLib

The shorter name matches the other helper libraries and lets 29 of the 66
call sites fit back on a single line.
---
 .agents/context/architecture.md               |  2 +-
 .../facets/IexecOrderManagementFacet.sol      | 28 ++++----
 contracts/facets/IexecPoco1Facet.sol          | 57 ++++++++-------
 contracts/facets/IexecPoco2Facet.sol          | 10 +--
 contracts/facets/IexecPocoAccessorsFacet.sol  | 10 +--
 contracts/facets/IexecPocoBoostFacet.sol      | 69 ++++++-------------
 ...reVerificationLib.sol => SignatureLib.sol} |  2 +-
 hardhat.config.ts                             |  2 +-
 8 files changed, 74 insertions(+), 106 deletions(-)
 rename contracts/libs/{SignatureVerificationLib.sol => SignatureLib.sol} (99%)

diff --git a/.agents/context/architecture.md b/.agents/context/architecture.md
index 3080c517d..788e22339 100644
--- a/.agents/context/architecture.md
+++ b/.agents/context/architecture.md
@@ -7,7 +7,7 @@
 -   Protocol logic: `contracts/facets/*Facet.sol`
 -   External API declarations: `contracts/interfaces/`
 -   `contracts/IexecInterfaceToken.sol` aggregates them into the single interface downstream tools compile against
--   Shared helpers: `contracts/abstract/` for inherited bases (`FacetBase`, `IexecEscrow`) and `contracts/libs/` for stateless helper libraries (`DealVolumeLib`, `SignatureVerificationLib`, …)
+-   Shared helpers: `contracts/abstract/` for inherited bases (`FacetBase`, `IexecEscrow`) and `contracts/libs/` for stateless helper libraries (`DealVolumeLib`, `SignatureLib`, …)
 -   Storage lives in one struct accessed through `contracts/libs/PocoStorageLib.sol`, shared by every facet: **never reorder or remove an existing variable, only append**. `npm run check-storage-layout` is the CI gate.
 -   Adding or removing a facet means editing two hand-maintained lists: `utils/proxy-tools.ts#getAllLocalFacetFunctions` (selector-to-name map used by upgrades) and the facet groups in `scripts/tools/sol-to-uml.mjs`.
 
diff --git a/contracts/facets/IexecOrderManagementFacet.sol b/contracts/facets/IexecOrderManagementFacet.sol
index 5fc77af9b..bf444ad74 100644
--- a/contracts/facets/IexecOrderManagementFacet.sol
+++ b/contracts/facets/IexecOrderManagementFacet.sol
@@ -5,7 +5,7 @@ pragma solidity ^0.8.0;
 
 import {IERC5313} from "@openzeppelin/contracts/interfaces/IERC5313.sol";
 import {FacetBase} from "../abstract/FacetBase.sol";
-import {SignatureVerificationLib} from "../libs/SignatureVerificationLib.sol";
+import {SignatureLib} from "../libs/SignatureLib.sol";
 import {IexecOrderManagement} from "../interfaces/IexecOrderManagement.sol";
 import {PocoStorageLib} from "../libs/PocoStorageLib.sol";
 import {IexecLibOrders_v5} from "../libs/IexecLibOrders_v5.sol";
@@ -30,17 +30,15 @@ contract IexecOrderManagementFacet is IexecOrderManagement, FacetBase {
         address owner = IERC5313(_apporderoperation.order.app).owner();
         require(
             owner == _msgSender() ||
-                SignatureVerificationLib.verifySignature(
+                SignatureLib.verifySignature(
                     owner,
-                    SignatureVerificationLib.toTypedDataHash(_apporderoperation.hash()),
+                    SignatureLib.toTypedDataHash(_apporderoperation.hash()),
                     _apporderoperation.sign
                 ),
             "invalid-sender-or-signature"
         );
 
-        bytes32 apporderHash = SignatureVerificationLib.toTypedDataHash(
-            _apporderoperation.order.hash()
-        );
+        bytes32 apporderHash = SignatureLib.toTypedDataHash(_apporderoperation.order.hash());
         if (_apporderoperation.operation == IexecLibOrders_v5.OrderOperationEnum.SIGN) {
             $.m_presigned[apporderHash] = owner;
             emit SignedAppOrder(apporderHash);
@@ -57,15 +55,15 @@ contract IexecOrderManagementFacet is IexecOrderManagement, FacetBase {
         address owner = IERC5313(_datasetorderoperation.order.dataset).owner();
         require(
             owner == _msgSender() ||
-                SignatureVerificationLib.verifySignature(
+                SignatureLib.verifySignature(
                     owner,
-                    SignatureVerificationLib.toTypedDataHash(_datasetorderoperation.hash()),
+                    SignatureLib.toTypedDataHash(_datasetorderoperation.hash()),
                     _datasetorderoperation.sign
                 ),
             "invalid-sender-or-signature"
         );
 
-        bytes32 datasetorderHash = SignatureVerificationLib.toTypedDataHash(
+        bytes32 datasetorderHash = SignatureLib.toTypedDataHash(
             _datasetorderoperation.order.hash()
         );
         if (_datasetorderoperation.operation == IexecLibOrders_v5.OrderOperationEnum.SIGN) {
@@ -84,15 +82,15 @@ contract IexecOrderManagementFacet is IexecOrderManagement, FacetBase {
         address owner = IERC5313(_workerpoolorderoperation.order.workerpool).owner();
         require(
             owner == _msgSender() ||
-                SignatureVerificationLib.verifySignature(
+                SignatureLib.verifySignature(
                     owner,
-                    SignatureVerificationLib.toTypedDataHash(_workerpoolorderoperation.hash()),
+                    SignatureLib.toTypedDataHash(_workerpoolorderoperation.hash()),
                     _workerpoolorderoperation.sign
                 ),
             "invalid-sender-or-signature"
         );
 
-        bytes32 workerpoolorderHash = SignatureVerificationLib.toTypedDataHash(
+        bytes32 workerpoolorderHash = SignatureLib.toTypedDataHash(
             _workerpoolorderoperation.order.hash()
         );
         if (_workerpoolorderoperation.operation == IexecLibOrders_v5.OrderOperationEnum.SIGN) {
@@ -113,15 +111,15 @@ contract IexecOrderManagementFacet is IexecOrderManagement, FacetBase {
         address owner = _requestorderoperation.order.requester;
         require(
             owner == _msgSender() ||
-                SignatureVerificationLib.verifySignature(
+                SignatureLib.verifySignature(
                     owner,
-                    SignatureVerificationLib.toTypedDataHash(_requestorderoperation.hash()),
+                    SignatureLib.toTypedDataHash(_requestorderoperation.hash()),
                     _requestorderoperation.sign
                 ),
             "invalid-sender-or-signature"
         );
 
-        bytes32 requestorderHash = SignatureVerificationLib.toTypedDataHash(
+        bytes32 requestorderHash = SignatureLib.toTypedDataHash(
             _requestorderoperation.order.hash()
         );
         if (_requestorderoperation.operation == IexecLibOrders_v5.OrderOperationEnum.SIGN) {
diff --git a/contracts/facets/IexecPoco1Facet.sol b/contracts/facets/IexecPoco1Facet.sol
index c6eef9b77..145cca40a 100644
--- a/contracts/facets/IexecPoco1Facet.sol
+++ b/contracts/facets/IexecPoco1Facet.sol
@@ -13,7 +13,7 @@ import {IexecPoco1} from "../interfaces/IexecPoco1.sol";
 import {IexecPoco1Errors} from "../interfaces/IexecPoco1Errors.sol";
 import {IexecEscrow} from "../abstract/IexecEscrow.sol";
 import {DealVolumeLib} from "../libs/DealVolumeLib.sol";
-import {SignatureVerificationLib} from "../libs/SignatureVerificationLib.sol";
+import {SignatureLib} from "../libs/SignatureLib.sol";
 
 struct Matching {
     bytes32 apporderHash;
@@ -41,14 +41,14 @@ contract IexecPoco1Facet is IexecPoco1, IexecPoco1Errors, IexecEscrow {
         bytes32 _hash,
         bytes calldata _signature
     ) external view override returns (bool) {
-        return SignatureVerificationLib.verifySignature(_identity, _hash, _signature);
+        return SignatureLib.verifySignature(_identity, _hash, _signature);
     }
 
     function verifyPresignature(
         address _identity,
         bytes32 _hash
     ) external view override returns (bool) {
-        return SignatureVerificationLib.verifyPresignature(_identity, _hash);
+        return SignatureLib.verifyPresignature(_identity, _hash);
     }
 
     function verifyPresignatureOrSignature(
@@ -56,7 +56,7 @@ contract IexecPoco1Facet is IexecPoco1, IexecPoco1Errors, IexecEscrow {
         bytes32 _hash,
         bytes calldata _signature
     ) external view override returns (bool) {
-        return SignatureVerificationLib.verifySignatureOrPresignature(_identity, _hash, _signature);
+        return SignatureLib.verifySignatureOrPresignature(_identity, _hash, _signature);
     }
 
     /**
@@ -79,7 +79,7 @@ contract IexecPoco1Facet is IexecPoco1, IexecPoco1Errors, IexecEscrow {
         bytes32 dealId
     ) external view override {
         PocoStorageLib.PocoStorage storage $ = PocoStorageLib.getPocoStorage();
-        bytes32 datasetOrderHash = SignatureVerificationLib.toTypedDataHash(datasetOrder.hash());
+        bytes32 datasetOrderHash = SignatureLib.toTypedDataHash(datasetOrder.hash());
         // Check if dataset order is not revoked or fully consumed.
         // Note: This should be the first check because it is the most important
         // and the most likely to occur (users revoking their dataset orders).
@@ -89,7 +89,7 @@ contract IexecPoco1Facet is IexecPoco1, IexecPoco1Errors, IexecEscrow {
         // Check dataset order signature (including presign and ERC-1271).
         address datasetOwner = IERC5313(datasetOrder.dataset).owner();
         if (
-            !SignatureVerificationLib.verifySignatureOrPresignature(
+            !SignatureLib.verifySignatureOrPresignature(
                 datasetOwner,
                 datasetOrderHash,
                 datasetOrder.sign
@@ -108,7 +108,7 @@ contract IexecPoco1Facet is IexecPoco1, IexecPoco1Errors, IexecEscrow {
         }
         // The deal's app should be allowed by order restriction.
         if (
-            !SignatureVerificationLib.isAccountAuthorizedByRestriction(
+            !SignatureLib.isAccountAuthorizedByRestriction(
                 datasetOrder.apprestrict,
                 deal.app.pointer
             )
@@ -117,7 +117,7 @@ contract IexecPoco1Facet is IexecPoco1, IexecPoco1Errors, IexecEscrow {
         }
         // The deal's workerpool should be allowed by order restriction.
         if (
-            !SignatureVerificationLib.isAccountAuthorizedByRestriction(
+            !SignatureLib.isAccountAuthorizedByRestriction(
                 datasetOrder.workerpoolrestrict,
                 deal.workerpool.pointer
             )
@@ -126,7 +126,7 @@ contract IexecPoco1Facet is IexecPoco1, IexecPoco1Errors, IexecEscrow {
         }
         // The deal's requester should be allowed by order restriction.
         if (
-            !SignatureVerificationLib.isAccountAuthorizedByRestriction(
+            !SignatureLib.isAccountAuthorizedByRestriction(
                 datasetOrder.requesterrestrict,
                 deal.requester
             )
@@ -263,70 +263,67 @@ contract IexecPoco1Facet is IexecPoco1, IexecPoco1Errors, IexecEscrow {
         require(_requestorder.app == _apporder.app, "iExecV5-matchOrders-0x10");
         require(_requestorder.dataset == _datasetorder.dataset, "iExecV5-matchOrders-0x11");
         require(
-            SignatureVerificationLib.isAccountAuthorizedByRestriction(
+            SignatureLib.isAccountAuthorizedByRestriction(
                 _requestorder.workerpool,
                 _workerpoolorder.workerpool
             ),
             "iExecV5-matchOrders-0x12"
         ); // requestorder.workerpool is a restriction
         require(
-            SignatureVerificationLib.isAccountAuthorizedByRestriction(
+            SignatureLib.isAccountAuthorizedByRestriction(
                 _apporder.datasetrestrict,
                 _datasetorder.dataset
             ),
             "iExecV5-matchOrders-0x13"
         );
         require(
-            SignatureVerificationLib.isAccountAuthorizedByRestriction(
+            SignatureLib.isAccountAuthorizedByRestriction(
                 _apporder.workerpoolrestrict,
                 _workerpoolorder.workerpool
             ),
             "iExecV5-matchOrders-0x14"
         );
         require(
-            SignatureVerificationLib.isAccountAuthorizedByRestriction(
+            SignatureLib.isAccountAuthorizedByRestriction(
                 _apporder.requesterrestrict,
                 _requestorder.requester
             ),
             "iExecV5-matchOrders-0x15"
         );
         require(
-            SignatureVerificationLib.isAccountAuthorizedByRestriction(
-                _datasetorder.apprestrict,
-                _apporder.app
-            ),
+            SignatureLib.isAccountAuthorizedByRestriction(_datasetorder.apprestrict, _apporder.app),
             "iExecV5-matchOrders-0x16"
         );
         require(
-            SignatureVerificationLib.isAccountAuthorizedByRestriction(
+            SignatureLib.isAccountAuthorizedByRestriction(
                 _datasetorder.workerpoolrestrict,
                 _workerpoolorder.workerpool
             ),
             "iExecV5-matchOrders-0x17"
         );
         require(
-            SignatureVerificationLib.isAccountAuthorizedByRestriction(
+            SignatureLib.isAccountAuthorizedByRestriction(
                 _datasetorder.requesterrestrict,
                 _requestorder.requester
             ),
             "iExecV5-matchOrders-0x18"
         );
         require(
-            SignatureVerificationLib.isAccountAuthorizedByRestriction(
+            SignatureLib.isAccountAuthorizedByRestriction(
                 _workerpoolorder.apprestrict,
                 _apporder.app
             ),
             "iExecV5-matchOrders-0x19"
         );
         require(
-            SignatureVerificationLib.isAccountAuthorizedByRestriction(
+            SignatureLib.isAccountAuthorizedByRestriction(
                 _workerpoolorder.datasetrestrict,
                 _datasetorder.dataset
             ),
             "iExecV5-matchOrders-0x1a"
         );
         require(
-            SignatureVerificationLib.isAccountAuthorizedByRestriction(
+            SignatureLib.isAccountAuthorizedByRestriction(
                 _workerpoolorder.requesterrestrict,
                 _requestorder.requester
             ),
@@ -341,12 +338,12 @@ contract IexecPoco1Facet is IexecPoco1, IexecPoco1Errors, IexecEscrow {
         ids.hasDataset = _datasetorder.dataset != address(0);
 
         // app
-        ids.apporderHash = SignatureVerificationLib.toTypedDataHash(_apporder.hash());
+        ids.apporderHash = SignatureLib.toTypedDataHash(_apporder.hash());
         ids.appOwner = IERC5313(_apporder.app).owner();
 
         require($.m_appregistry.isRegistered(_apporder.app), "iExecV5-matchOrders-0x20");
         require(
-            SignatureVerificationLib.verifySignatureOrPresignature(
+            SignatureLib.verifySignatureOrPresignature(
                 ids.appOwner,
                 ids.apporderHash,
                 _apporder.sign
@@ -357,7 +354,7 @@ contract IexecPoco1Facet is IexecPoco1, IexecPoco1Errors, IexecEscrow {
         // dataset
         if (ids.hasDataset) {
             // only check if dataset is enabled
-            ids.datasetorderHash = SignatureVerificationLib.toTypedDataHash(_datasetorder.hash());
+            ids.datasetorderHash = SignatureLib.toTypedDataHash(_datasetorder.hash());
             ids.datasetOwner = IERC5313(_datasetorder.dataset).owner();
 
             require(
@@ -365,7 +362,7 @@ contract IexecPoco1Facet is IexecPoco1, IexecPoco1Errors, IexecEscrow {
                 "iExecV5-matchOrders-0x30"
             );
             require(
-                SignatureVerificationLib.verifySignatureOrPresignature(
+                SignatureLib.verifySignatureOrPresignature(
                     ids.datasetOwner,
                     ids.datasetorderHash,
                     _datasetorder.sign
@@ -375,7 +372,7 @@ contract IexecPoco1Facet is IexecPoco1, IexecPoco1Errors, IexecEscrow {
         }
 
         // workerpool
-        ids.workerpoolorderHash = SignatureVerificationLib.toTypedDataHash(_workerpoolorder.hash());
+        ids.workerpoolorderHash = SignatureLib.toTypedDataHash(_workerpoolorder.hash());
         ids.workerpoolOwner = IERC5313(_workerpoolorder.workerpool).owner();
 
         require(
@@ -383,7 +380,7 @@ contract IexecPoco1Facet is IexecPoco1, IexecPoco1Errors, IexecEscrow {
             "iExecV5-matchOrders-0x40"
         );
         require(
-            SignatureVerificationLib.verifySignatureOrPresignature(
+            SignatureLib.verifySignatureOrPresignature(
                 ids.workerpoolOwner,
                 ids.workerpoolorderHash,
                 _workerpoolorder.sign
@@ -392,9 +389,9 @@ contract IexecPoco1Facet is IexecPoco1, IexecPoco1Errors, IexecEscrow {
         );
 
         // request
-        ids.requestorderHash = SignatureVerificationLib.toTypedDataHash(_requestorder.hash());
+        ids.requestorderHash = SignatureLib.toTypedDataHash(_requestorder.hash());
         require(
-            SignatureVerificationLib.verifySignatureOrPresignature(
+            SignatureLib.verifySignatureOrPresignature(
                 _requestorder.requester,
                 ids.requestorderHash,
                 _requestorder.sign
diff --git a/contracts/facets/IexecPoco2Facet.sol b/contracts/facets/IexecPoco2Facet.sol
index 70d921867..e3f939a41 100644
--- a/contracts/facets/IexecPoco2Facet.sol
+++ b/contracts/facets/IexecPoco2Facet.sol
@@ -10,7 +10,7 @@ import {IexecLibCore_v5} from "../libs/IexecLibCore_v5.sol";
 import {IexecLibOrders_v5} from "../libs/IexecLibOrders_v5.sol";
 import {IexecPoco2} from "../interfaces/IexecPoco2.sol";
 import {IexecEscrow} from "../abstract/IexecEscrow.sol";
-import {SignatureVerificationLib} from "../libs/SignatureVerificationLib.sol";
+import {SignatureLib} from "../libs/SignatureLib.sol";
 
 contract IexecPoco2Facet is IexecPoco2, IexecEscrow {
     modifier onlyScheduler(bytes32 _taskId) {
@@ -119,7 +119,7 @@ contract IexecPoco2Facet is IexecPoco2, IexecEscrow {
 
         // Check that the worker + taskid + enclave combo is authorized to contribute (scheduler signature)
         require(
-            SignatureVerificationLib.verifySignatureOfEthSignedMessage(
+            SignatureLib.verifySignatureOfEthSignedMessage(
                 (_enclaveChallenge != address(0) && $.m_teebroker != address(0))
                     ? $.m_teebroker
                     : deal.workerpool.owner,
@@ -131,7 +131,7 @@ contract IexecPoco2Facet is IexecPoco2, IexecEscrow {
         // Check enclave signature
         require(
             _enclaveChallenge == address(0) ||
-                SignatureVerificationLib.verifySignatureOfEthSignedMessage(
+                SignatureLib.verifySignatureOfEthSignedMessage(
                     _enclaveChallenge,
                     abi.encodePacked(_resultHash, _resultSeal),
                     _enclaveSign
@@ -206,7 +206,7 @@ contract IexecPoco2Facet is IexecPoco2, IexecEscrow {
 
         // Check that the worker + taskid + enclave combo is authorized to contribute (scheduler signature)
         require(
-            SignatureVerificationLib.verifySignatureOfEthSignedMessage(
+            SignatureLib.verifySignatureOfEthSignedMessage(
                 (_enclaveChallenge != address(0) && $.m_teebroker != address(0))
                     ? $.m_teebroker
                     : deal.workerpool.owner,
@@ -218,7 +218,7 @@ contract IexecPoco2Facet is IexecPoco2, IexecEscrow {
         // Check enclave signature
         require(
             _enclaveChallenge == address(0) ||
-                SignatureVerificationLib.verifySignatureOfEthSignedMessage(
+                SignatureLib.verifySignatureOfEthSignedMessage(
                     _enclaveChallenge,
                     abi.encodePacked(resultHash, resultSeal),
                     _enclaveSign
diff --git a/contracts/facets/IexecPocoAccessorsFacet.sol b/contracts/facets/IexecPocoAccessorsFacet.sol
index fa922ee14..021a00b6d 100644
--- a/contracts/facets/IexecPocoAccessorsFacet.sol
+++ b/contracts/facets/IexecPocoAccessorsFacet.sol
@@ -13,7 +13,7 @@ import {IexecPocoAccessors} from "../interfaces/IexecPocoAccessors.sol";
 import {IRegistry} from "../registries/IRegistry.sol";
 import {DealVolumeLib} from "../libs/DealVolumeLib.sol";
 import {FacetBase} from "../abstract/FacetBase.sol";
-import {SignatureVerificationLib} from "../libs/SignatureVerificationLib.sol";
+import {SignatureLib} from "../libs/SignatureLib.sol";
 
 /**
  * @title Getters contract for PoCo facets.
@@ -63,14 +63,14 @@ contract IexecPocoAccessorsFacet is IexecPocoAccessors, FacetBase {
         return
             DealVolumeLib.computeDealVolume(
                 appOrder.volume,
-                SignatureVerificationLib.toTypedDataHash(appOrder.hash()),
+                SignatureLib.toTypedDataHash(appOrder.hash()),
                 datasetOrder.dataset != address(0),
                 datasetOrder.volume,
-                SignatureVerificationLib.toTypedDataHash(datasetOrder.hash()),
+                SignatureLib.toTypedDataHash(datasetOrder.hash()),
                 workerpoolOrder.volume,
-                SignatureVerificationLib.toTypedDataHash(workerpoolOrder.hash()),
+                SignatureLib.toTypedDataHash(workerpoolOrder.hash()),
                 requestOrder.volume,
-                SignatureVerificationLib.toTypedDataHash(requestOrder.hash())
+                SignatureLib.toTypedDataHash(requestOrder.hash())
             );
     }
 
diff --git a/contracts/facets/IexecPocoBoostFacet.sol b/contracts/facets/IexecPocoBoostFacet.sol
index af9c5e92a..8d50c5ab2 100644
--- a/contracts/facets/IexecPocoBoostFacet.sol
+++ b/contracts/facets/IexecPocoBoostFacet.sol
@@ -17,7 +17,7 @@ import {IexecPocoBoost} from "../interfaces/IexecPocoBoost.sol";
 import {IexecEscrow} from "../abstract/IexecEscrow.sol";
 import {DealVolumeLib} from "../libs/DealVolumeLib.sol";
 import {PocoStorageLib} from "../libs/PocoStorageLib.sol";
-import {SignatureVerificationLib} from "../libs/SignatureVerificationLib.sol";
+import {SignatureLib} from "../libs/SignatureLib.sol";
 
 //
 // Not deployed yet!
@@ -161,71 +161,50 @@ contract IexecPocoBoostFacet is IexecPocoBoost, IexecEscrow {
         // Check all possible restrictions.
         address workerpool = workerpoolOrder.workerpool;
         require(
-            SignatureVerificationLib.isAccountAuthorizedByRestriction(
-                requestOrder.workerpool,
-                workerpool
-            ),
+            SignatureLib.isAccountAuthorizedByRestriction(requestOrder.workerpool, workerpool),
             "PocoBoost: Workerpool restricted by request order"
         );
         require(
-            SignatureVerificationLib.isAccountAuthorizedByRestriction(
-                appOrder.datasetrestrict,
-                dataset
-            ),
+            SignatureLib.isAccountAuthorizedByRestriction(appOrder.datasetrestrict, dataset),
             "PocoBoost: Dataset restricted by app order"
         );
         require(
-            SignatureVerificationLib.isAccountAuthorizedByRestriction(
-                appOrder.workerpoolrestrict,
-                workerpool
-            ),
+            SignatureLib.isAccountAuthorizedByRestriction(appOrder.workerpoolrestrict, workerpool),
             "PocoBoost: Workerpool restricted by app order"
         );
         address requester = requestOrder.requester;
         require(
-            SignatureVerificationLib.isAccountAuthorizedByRestriction(
-                appOrder.requesterrestrict,
-                requester
-            ),
+            SignatureLib.isAccountAuthorizedByRestriction(appOrder.requesterrestrict, requester),
             "PocoBoost: Requester restricted by app order"
         );
         require(
-            SignatureVerificationLib.isAccountAuthorizedByRestriction(
-                datasetOrder.apprestrict,
-                app
-            ),
+            SignatureLib.isAccountAuthorizedByRestriction(datasetOrder.apprestrict, app),
             "PocoBoost: App restricted by dataset order"
         );
         require(
-            SignatureVerificationLib.isAccountAuthorizedByRestriction(
+            SignatureLib.isAccountAuthorizedByRestriction(
                 datasetOrder.workerpoolrestrict,
                 workerpool
             ),
             "PocoBoost: Workerpool restricted by dataset order"
         );
         require(
-            SignatureVerificationLib.isAccountAuthorizedByRestriction(
+            SignatureLib.isAccountAuthorizedByRestriction(
                 datasetOrder.requesterrestrict,
                 requester
             ),
             "PocoBoost: Requester restricted by dataset order"
         );
         require(
-            SignatureVerificationLib.isAccountAuthorizedByRestriction(
-                workerpoolOrder.apprestrict,
-                app
-            ),
+            SignatureLib.isAccountAuthorizedByRestriction(workerpoolOrder.apprestrict, app),
             "PocoBoost: App restricted by workerpool order"
         );
         require(
-            SignatureVerificationLib.isAccountAuthorizedByRestriction(
-                workerpoolOrder.datasetrestrict,
-                dataset
-            ),
+            SignatureLib.isAccountAuthorizedByRestriction(workerpoolOrder.datasetrestrict, dataset),
             "PocoBoost: Dataset restricted by workerpool order"
         );
         require(
-            SignatureVerificationLib.isAccountAuthorizedByRestriction(
+            SignatureLib.isAccountAuthorizedByRestriction(
                 workerpoolOrder.requesterrestrict,
                 requester
             ),
@@ -234,9 +213,9 @@ contract IexecPocoBoostFacet is IexecPocoBoost, IexecEscrow {
         // Check ownership, registration, and signatures for app and dataset.
         require($.m_appregistry.isRegistered(app), "PocoBoost: App not registered");
         address appOwner = IERC5313(app).owner();
-        bytes32 appOrderTypedDataHash = SignatureVerificationLib.toTypedDataHash(appOrder.hash());
+        bytes32 appOrderTypedDataHash = SignatureLib.toTypedDataHash(appOrder.hash());
         require(
-            SignatureVerificationLib.verifySignatureOrPresignature(
+            SignatureLib.verifySignatureOrPresignature(
                 appOwner,
                 appOrderTypedDataHash,
                 appOrder.sign
@@ -249,11 +228,9 @@ contract IexecPocoBoostFacet is IexecPocoBoost, IexecEscrow {
         if (hasDataset) {
             require($.m_datasetregistry.isRegistered(dataset), "PocoBoost: Dataset not registered");
             datasetOwner = IERC5313(dataset).owner();
-            datasetOrderTypedDataHash = SignatureVerificationLib.toTypedDataHash(
-                datasetOrder.hash()
-            );
+            datasetOrderTypedDataHash = SignatureLib.toTypedDataHash(datasetOrder.hash());
             require(
-                SignatureVerificationLib.verifySignatureOrPresignature(
+                SignatureLib.verifySignatureOrPresignature(
                     datasetOwner,
                     datasetOrderTypedDataHash,
                     datasetOrder.sign
@@ -267,22 +244,18 @@ contract IexecPocoBoostFacet is IexecPocoBoost, IexecEscrow {
             "PocoBoost: Workerpool not registered"
         );
         address workerpoolOwner = IERC5313(workerpool).owner();
-        bytes32 workerpoolOrderTypedDataHash = SignatureVerificationLib.toTypedDataHash(
-            workerpoolOrder.hash()
-        );
+        bytes32 workerpoolOrderTypedDataHash = SignatureLib.toTypedDataHash(workerpoolOrder.hash());
         require(
-            SignatureVerificationLib.verifySignatureOrPresignature(
+            SignatureLib.verifySignatureOrPresignature(
                 workerpoolOwner,
                 workerpoolOrderTypedDataHash,
                 workerpoolOrder.sign
             ),
             "PocoBoost: Invalid workerpool order signature"
         );
-        bytes32 requestOrderTypedDataHash = SignatureVerificationLib.toTypedDataHash(
-            requestOrder.hash()
-        );
+        bytes32 requestOrderTypedDataHash = SignatureLib.toTypedDataHash(requestOrder.hash());
         require(
-            SignatureVerificationLib.verifySignatureOrPresignature(
+            SignatureLib.verifySignatureOrPresignature(
                 requester,
                 requestOrderTypedDataHash,
                 requestOrder.sign
@@ -438,7 +411,7 @@ contract IexecPocoBoostFacet is IexecPocoBoost, IexecEscrow {
         address workerpoolOwner = deal.workerpoolOwner;
         // Check scheduler or TEE broker signature
         require(
-            SignatureVerificationLib.verifySignatureOfEthSignedMessage(
+            SignatureLib.verifySignatureOfEthSignedMessage(
                 enclaveChallenge != address(0) && $.m_teebroker != address(0)
                     ? $.m_teebroker
                     : workerpoolOwner,
@@ -451,7 +424,7 @@ contract IexecPocoBoostFacet is IexecPocoBoost, IexecEscrow {
         // Check enclave signature
         require(
             enclaveChallenge == address(0) ||
-                SignatureVerificationLib.verifySignatureOfEthSignedMessage(
+                SignatureLib.verifySignatureOfEthSignedMessage(
                     enclaveChallenge,
                     abi.encodePacked(
                         msg.sender,
diff --git a/contracts/libs/SignatureVerificationLib.sol b/contracts/libs/SignatureLib.sol
similarity index 99%
rename from contracts/libs/SignatureVerificationLib.sol
rename to contracts/libs/SignatureLib.sol
index 726c08f7a..29d3de380 100644
--- a/contracts/libs/SignatureVerificationLib.sol
+++ b/contracts/libs/SignatureLib.sol
@@ -12,7 +12,7 @@ import {PocoStorageLib} from "./PocoStorageLib.sol";
 /**
  * @title Verify order and contribution signatures, presignatures and restrictions.
  */
-library SignatureVerificationLib {
+library SignatureLib {
     using ECDSA for bytes32;
 
     // Used with ERC-734 Key Manager identity contract for authorization management.
diff --git a/hardhat.config.ts b/hardhat.config.ts
index 439dc6b69..74bf9e0b5 100644
--- a/hardhat.config.ts
+++ b/hardhat.config.ts
@@ -171,7 +171,7 @@ const config: HardhatUserConfig = {
             // TODO: put all events and soldoc inside interfaces and use them instead of contracts.
             'interfaces/', // interesting for events but too much doc duplication if enabled
             'libs/DealVolumeLib.sol', // contains only internal/private
-            'libs/SignatureVerificationLib.sol', // contains only internal/private
+            'libs/SignatureLib.sol', // contains only internal/private
             'tools/',
             'Diamond.sol', // not relevant
         ],

From 737221a994843c584b1471e753d5e591e3663de7 Mon Sep 17 00:00:00 2001
From: Zied <26070035+zguesmi@users.noreply.github.com>
Date: Tue, 1 Sep 2026 15:35:35 +0200
Subject: [PATCH 05/17] refactor: hold the protocol constants in ConstantsLib

Converting SignatureVerifier to a library forced a second declaration of
GROUPMEMBER_PURPOSE, because a library cannot inherit FacetBase and a
contract constant is not reachable from outside the contract at any
visibility: solc rejects FacetBase.GROUPMEMBER_PURPOSE from a library with
"Member not found or not visible after argument-dependent lookup". A
library constant has no such restriction, so ConstantsLib becomes the
single declaration of all eight protocol constants.

FacetBase keeps the eight names as aliases of the library's values, so the
31 bare uses in the facets and the eight public getters on
IexecPocoAccessorsFacet are untouched.

No ABI change. Constant folding is preserved: the deployed bytecode still
holds one PUSH each for 1e9, the kitty address and the stake ratio, and
the same count of the literal 4. Four facets grew between 8 and 48 bytes
of jump-offset churn under viaIR; the largest, IexecPocoBoostFacet, sits
at 16665 of the 24576-byte limit.
---
 contracts/abstract/FacetBase.sol | 27 ++++++++++++---------------
 contracts/libs/ConstantsLib.sol  | 28 ++++++++++++++++++++++++++++
 contracts/libs/SignatureLib.sol  |  6 ++----
 3 files changed, 42 insertions(+), 19 deletions(-)
 create mode 100644 contracts/libs/ConstantsLib.sol

diff --git a/contracts/abstract/FacetBase.sol b/contracts/abstract/FacetBase.sol
index cc3b877e5..bd675390a 100644
--- a/contracts/abstract/FacetBase.sol
+++ b/contracts/abstract/FacetBase.sol
@@ -3,6 +3,7 @@
 
 pragma solidity ^0.8.0;
 
+import {ConstantsLib} from "../libs/ConstantsLib.sol";
 import {PocoStorageLib} from "../libs/PocoStorageLib.sol";
 import {IERC5313} from "@openzeppelin/contracts/interfaces/IERC5313.sol";
 
@@ -13,21 +14,17 @@ import {IERC5313} from "@openzeppelin/contracts/interfaces/IERC5313.sol";
  * @dev Every facet must inherit from this contract.
  */
 abstract contract FacetBase {
-    // Poco - Constants
-    uint256 internal constant CONTRIBUTION_DEADLINE_RATIO = 7;
-    uint256 internal constant REVEAL_DEADLINE_RATIO = 2;
-    uint256 internal constant FINAL_DEADLINE_RATIO = 10;
-    uint256 internal constant WORKERPOOL_STAKE_RATIO = 30;
-    uint256 internal constant KITTY_RATIO = 10;
-    uint256 internal constant KITTY_MIN = 1e9; // ADJUSTEMENT VARIABLE
-
-    // Seized funds of workerpools that do not honor their deals are sent
-    // out to this kitty address.
-    // It is determined with address(uint256(keccak256(bytes('iExecKitty'))) - 1).
-    address internal constant KITTY_ADDRESS = 0x99c2268479b93fDe36232351229815DF80837e23;
-
-    // Used with ERC-734 Key Manager identity contract for authorization management.
-    uint256 internal constant GROUPMEMBER_PURPOSE = 4;
+    // Protocol constants, kept reachable under their bare names by the facets
+    // that inherit this contract. {ConstantsLib} is the single declaration.
+    uint256 internal constant CONTRIBUTION_DEADLINE_RATIO =
+        ConstantsLib.CONTRIBUTION_DEADLINE_RATIO;
+    uint256 internal constant REVEAL_DEADLINE_RATIO = ConstantsLib.REVEAL_DEADLINE_RATIO;
+    uint256 internal constant FINAL_DEADLINE_RATIO = ConstantsLib.FINAL_DEADLINE_RATIO;
+    uint256 internal constant WORKERPOOL_STAKE_RATIO = ConstantsLib.WORKERPOOL_STAKE_RATIO;
+    uint256 internal constant KITTY_RATIO = ConstantsLib.KITTY_RATIO;
+    uint256 internal constant KITTY_MIN = ConstantsLib.KITTY_MIN;
+    address internal constant KITTY_ADDRESS = ConstantsLib.KITTY_ADDRESS;
+    uint256 internal constant GROUPMEMBER_PURPOSE = ConstantsLib.GROUPMEMBER_PURPOSE;
 
     modifier onlyOwner() {
         require(_msgSender() == owner(), "Ownable: caller is not the owner");
diff --git a/contracts/libs/ConstantsLib.sol b/contracts/libs/ConstantsLib.sol
new file mode 100644
index 000000000..b998fc8a9
--- /dev/null
+++ b/contracts/libs/ConstantsLib.sol
@@ -0,0 +1,28 @@
+// SPDX-FileCopyrightText: 2020-2025 IEXEC BLOCKCHAIN TECH <contact@iex.ec>
+// SPDX-License-Identifier: Apache-2.0
+
+pragma solidity ^0.8.0;
+
+/**
+ * @title Protocol constants.
+ * @dev Declared in a library rather than in a base contract so that libraries
+ * can read them too: a library cannot inherit, and a contract constant is not
+ * reachable from outside the contract at any visibility.
+ */
+library ConstantsLib {
+    // Poco - Constants
+    uint256 internal constant CONTRIBUTION_DEADLINE_RATIO = 7;
+    uint256 internal constant REVEAL_DEADLINE_RATIO = 2;
+    uint256 internal constant FINAL_DEADLINE_RATIO = 10;
+    uint256 internal constant WORKERPOOL_STAKE_RATIO = 30;
+    uint256 internal constant KITTY_RATIO = 10;
+    uint256 internal constant KITTY_MIN = 1e9; // ADJUSTEMENT VARIABLE
+
+    // Seized funds of workerpools that do not honor their deals are sent
+    // out to this kitty address.
+    // It is determined with address(uint256(keccak256(bytes('iExecKitty'))) - 1).
+    address internal constant KITTY_ADDRESS = 0x99c2268479b93fDe36232351229815DF80837e23;
+
+    // Used with ERC-734 Key Manager identity contract for authorization management.
+    uint256 internal constant GROUPMEMBER_PURPOSE = 4;
+}
diff --git a/contracts/libs/SignatureLib.sol b/contracts/libs/SignatureLib.sol
index 29d3de380..5cc493713 100644
--- a/contracts/libs/SignatureLib.sol
+++ b/contracts/libs/SignatureLib.sol
@@ -7,6 +7,7 @@ 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 {IERC734} from "../external/interfaces/IERC734.sol";
+import {ConstantsLib} from "./ConstantsLib.sol";
 import {PocoStorageLib} from "./PocoStorageLib.sol";
 
 /**
@@ -15,9 +16,6 @@ import {PocoStorageLib} from "./PocoStorageLib.sol";
 library SignatureLib {
     using ECDSA for bytes32;
 
-    // Used with ERC-734 Key Manager identity contract for authorization management.
-    uint256 private constant GROUPMEMBER_PURPOSE = 4;
-
     /**
      * Hash a Typed Data using the configured domain.
      * @param structHash The original structure hash.
@@ -144,7 +142,7 @@ library SignatureLib {
             try
                 IERC734(restriction).keyHasPurpose( // ERC734 identity contract restriction
                         bytes32(uint256(uint160(account))),
-                        GROUPMEMBER_PURPOSE
+                        ConstantsLib.GROUPMEMBER_PURPOSE
                     )
             returns (bool success) {
                 return success;

From 563aaa1a5b4e4b08af97bd10caa8724793f288ad Mon Sep 17 00:00:00 2001
From: Zied <26070035+zguesmi@users.noreply.github.com>
Date: Tue, 1 Sep 2026 15:46:47 +0200
Subject: [PATCH 06/17] Revert "refactor: hold the protocol constants in
 ConstantsLib"

This reverts commit 737221a9. The constants move is deferred to the next
PR, so SignatureLib keeps its own GROUPMEMBER_PURPOSE for now and
FacetBase carries a TODO recording why the duplicate exists and what
replaces it.
---
 contracts/abstract/FacetBase.sol | 32 ++++++++++++++++++++------------
 contracts/libs/ConstantsLib.sol  | 28 ----------------------------
 contracts/libs/SignatureLib.sol  |  6 ++++--
 3 files changed, 24 insertions(+), 42 deletions(-)
 delete mode 100644 contracts/libs/ConstantsLib.sol

diff --git a/contracts/abstract/FacetBase.sol b/contracts/abstract/FacetBase.sol
index bd675390a..65cf25983 100644
--- a/contracts/abstract/FacetBase.sol
+++ b/contracts/abstract/FacetBase.sol
@@ -3,7 +3,6 @@
 
 pragma solidity ^0.8.0;
 
-import {ConstantsLib} from "../libs/ConstantsLib.sol";
 import {PocoStorageLib} from "../libs/PocoStorageLib.sol";
 import {IERC5313} from "@openzeppelin/contracts/interfaces/IERC5313.sol";
 
@@ -14,17 +13,26 @@ import {IERC5313} from "@openzeppelin/contracts/interfaces/IERC5313.sol";
  * @dev Every facet must inherit from this contract.
  */
 abstract contract FacetBase {
-    // Protocol constants, kept reachable under their bare names by the facets
-    // that inherit this contract. {ConstantsLib} is the single declaration.
-    uint256 internal constant CONTRIBUTION_DEADLINE_RATIO =
-        ConstantsLib.CONTRIBUTION_DEADLINE_RATIO;
-    uint256 internal constant REVEAL_DEADLINE_RATIO = ConstantsLib.REVEAL_DEADLINE_RATIO;
-    uint256 internal constant FINAL_DEADLINE_RATIO = ConstantsLib.FINAL_DEADLINE_RATIO;
-    uint256 internal constant WORKERPOOL_STAKE_RATIO = ConstantsLib.WORKERPOOL_STAKE_RATIO;
-    uint256 internal constant KITTY_RATIO = ConstantsLib.KITTY_RATIO;
-    uint256 internal constant KITTY_MIN = ConstantsLib.KITTY_MIN;
-    address internal constant KITTY_ADDRESS = ConstantsLib.KITTY_ADDRESS;
-    uint256 internal constant GROUPMEMBER_PURPOSE = ConstantsLib.GROUPMEMBER_PURPOSE;
+    // TODO move these constants to a ConstantsLib library and reference them as
+    // ConstantsLib.<NAME> in the next PR. A library cannot inherit this contract
+    // and solc rejects FacetBase.<NAME> from outside the contract at any
+    // visibility, which is why SignatureLib redeclares GROUPMEMBER_PURPOSE today.
+
+    // Poco - Constants
+    uint256 internal constant CONTRIBUTION_DEADLINE_RATIO = 7;
+    uint256 internal constant REVEAL_DEADLINE_RATIO = 2;
+    uint256 internal constant FINAL_DEADLINE_RATIO = 10;
+    uint256 internal constant WORKERPOOL_STAKE_RATIO = 30;
+    uint256 internal constant KITTY_RATIO = 10;
+    uint256 internal constant KITTY_MIN = 1e9; // ADJUSTEMENT VARIABLE
+
+    // Seized funds of workerpools that do not honor their deals are sent
+    // out to this kitty address.
+    // It is determined with address(uint256(keccak256(bytes('iExecKitty'))) - 1).
+    address internal constant KITTY_ADDRESS = 0x99c2268479b93fDe36232351229815DF80837e23;
+
+    // Used with ERC-734 Key Manager identity contract for authorization management.
+    uint256 internal constant GROUPMEMBER_PURPOSE = 4;
 
     modifier onlyOwner() {
         require(_msgSender() == owner(), "Ownable: caller is not the owner");
diff --git a/contracts/libs/ConstantsLib.sol b/contracts/libs/ConstantsLib.sol
deleted file mode 100644
index b998fc8a9..000000000
--- a/contracts/libs/ConstantsLib.sol
+++ /dev/null
@@ -1,28 +0,0 @@
-// SPDX-FileCopyrightText: 2020-2025 IEXEC BLOCKCHAIN TECH <contact@iex.ec>
-// SPDX-License-Identifier: Apache-2.0
-
-pragma solidity ^0.8.0;
-
-/**
- * @title Protocol constants.
- * @dev Declared in a library rather than in a base contract so that libraries
- * can read them too: a library cannot inherit, and a contract constant is not
- * reachable from outside the contract at any visibility.
- */
-library ConstantsLib {
-    // Poco - Constants
-    uint256 internal constant CONTRIBUTION_DEADLINE_RATIO = 7;
-    uint256 internal constant REVEAL_DEADLINE_RATIO = 2;
-    uint256 internal constant FINAL_DEADLINE_RATIO = 10;
-    uint256 internal constant WORKERPOOL_STAKE_RATIO = 30;
-    uint256 internal constant KITTY_RATIO = 10;
-    uint256 internal constant KITTY_MIN = 1e9; // ADJUSTEMENT VARIABLE
-
-    // Seized funds of workerpools that do not honor their deals are sent
-    // out to this kitty address.
-    // It is determined with address(uint256(keccak256(bytes('iExecKitty'))) - 1).
-    address internal constant KITTY_ADDRESS = 0x99c2268479b93fDe36232351229815DF80837e23;
-
-    // Used with ERC-734 Key Manager identity contract for authorization management.
-    uint256 internal constant GROUPMEMBER_PURPOSE = 4;
-}
diff --git a/contracts/libs/SignatureLib.sol b/contracts/libs/SignatureLib.sol
index 5cc493713..29d3de380 100644
--- a/contracts/libs/SignatureLib.sol
+++ b/contracts/libs/SignatureLib.sol
@@ -7,7 +7,6 @@ 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 {IERC734} from "../external/interfaces/IERC734.sol";
-import {ConstantsLib} from "./ConstantsLib.sol";
 import {PocoStorageLib} from "./PocoStorageLib.sol";
 
 /**
@@ -16,6 +15,9 @@ import {PocoStorageLib} from "./PocoStorageLib.sol";
 library SignatureLib {
     using ECDSA for bytes32;
 
+    // Used with ERC-734 Key Manager identity contract for authorization management.
+    uint256 private constant GROUPMEMBER_PURPOSE = 4;
+
     /**
      * Hash a Typed Data using the configured domain.
      * @param structHash The original structure hash.
@@ -142,7 +144,7 @@ library SignatureLib {
             try
                 IERC734(restriction).keyHasPurpose( // ERC734 identity contract restriction
                         bytes32(uint256(uint160(account))),
-                        ConstantsLib.GROUPMEMBER_PURPOSE
+                        GROUPMEMBER_PURPOSE
                     )
             returns (bool success) {
                 return success;

From 0216491bcb4705fe7ad7ddb475c3a5bacd95367b Mon Sep 17 00:00:00 2001
From: Zied <26070035+zguesmi@users.noreply.github.com>
Date: Tue, 1 Sep 2026 15:49:02 +0200
Subject: [PATCH 07/17] refactor: merge DealVolumeLib into SignatureLib and
 rename it CommonLib

The two libraries served the same five facets and each held helpers that
are stateless reads over diamond storage, so one library keeps the import
lists shorter without changing what the facets can reach. computeDealVolume
goes last, after the signature and restriction helpers.

The deployed bytecode of every facet is byte-identical to before the merge,
and no ABI changes: internal library functions are inlined either way.
---
 .agents/context/architecture.md               |  2 +-
 contracts/abstract/FacetBase.sol              |  5 +-
 .../facets/IexecOrderManagementFacet.sol      | 30 ++++-----
 contracts/facets/IexecPoco1Facet.sol          | 67 ++++++++-----------
 contracts/facets/IexecPoco2Facet.sol          | 10 +--
 contracts/facets/IexecPocoAccessorsFacet.sol  | 13 ++--
 contracts/facets/IexecPocoBoostFacet.sol      | 55 ++++++---------
 .../libs/{SignatureLib.sol => CommonLib.sol}  | 46 ++++++++++++-
 contracts/libs/DealVolumeLib.sol              | 53 ---------------
 hardhat.config.ts                             |  3 +-
 10 files changed, 122 insertions(+), 162 deletions(-)
 rename contracts/libs/{SignatureLib.sol => CommonLib.sol} (74%)
 delete mode 100644 contracts/libs/DealVolumeLib.sol

diff --git a/.agents/context/architecture.md b/.agents/context/architecture.md
index 788e22339..fbf66a1e4 100644
--- a/.agents/context/architecture.md
+++ b/.agents/context/architecture.md
@@ -7,7 +7,7 @@
 -   Protocol logic: `contracts/facets/*Facet.sol`
 -   External API declarations: `contracts/interfaces/`
 -   `contracts/IexecInterfaceToken.sol` aggregates them into the single interface downstream tools compile against
--   Shared helpers: `contracts/abstract/` for inherited bases (`FacetBase`, `IexecEscrow`) and `contracts/libs/` for stateless helper libraries (`DealVolumeLib`, `SignatureLib`, …)
+-   Shared helpers: `contracts/abstract/` for inherited bases (`FacetBase`, `IexecEscrow`) and `contracts/libs/` for stateless helper libraries (`CommonLib`, `PocoStorageLib`, …)
 -   Storage lives in one struct accessed through `contracts/libs/PocoStorageLib.sol`, shared by every facet: **never reorder or remove an existing variable, only append**. `npm run check-storage-layout` is the CI gate.
 -   Adding or removing a facet means editing two hand-maintained lists: `utils/proxy-tools.ts#getAllLocalFacetFunctions` (selector-to-name map used by upgrades) and the facet groups in `scripts/tools/sol-to-uml.mjs`.
 
diff --git a/contracts/abstract/FacetBase.sol b/contracts/abstract/FacetBase.sol
index 65cf25983..2cd15a438 100644
--- a/contracts/abstract/FacetBase.sol
+++ b/contracts/abstract/FacetBase.sol
@@ -14,9 +14,8 @@ import {IERC5313} from "@openzeppelin/contracts/interfaces/IERC5313.sol";
  */
 abstract contract FacetBase {
     // TODO move these constants to a ConstantsLib library and reference them as
-    // ConstantsLib.<NAME> in the next PR. A library cannot inherit this contract
-    // and solc rejects FacetBase.<NAME> from outside the contract at any
-    // visibility, which is why SignatureLib redeclares GROUPMEMBER_PURPOSE today.
+    // ConstantsLib.<NAME> in the next PR.
+    // CommonLib redeclares GROUPMEMBER_PURPOSE temporarily.
 
     // Poco - Constants
     uint256 internal constant CONTRIBUTION_DEADLINE_RATIO = 7;
diff --git a/contracts/facets/IexecOrderManagementFacet.sol b/contracts/facets/IexecOrderManagementFacet.sol
index bf444ad74..d1249f3dc 100644
--- a/contracts/facets/IexecOrderManagementFacet.sol
+++ b/contracts/facets/IexecOrderManagementFacet.sol
@@ -5,7 +5,7 @@ pragma solidity ^0.8.0;
 
 import {IERC5313} from "@openzeppelin/contracts/interfaces/IERC5313.sol";
 import {FacetBase} from "../abstract/FacetBase.sol";
-import {SignatureLib} from "../libs/SignatureLib.sol";
+import {CommonLib} from "../libs/CommonLib.sol";
 import {IexecOrderManagement} from "../interfaces/IexecOrderManagement.sol";
 import {PocoStorageLib} from "../libs/PocoStorageLib.sol";
 import {IexecLibOrders_v5} from "../libs/IexecLibOrders_v5.sol";
@@ -30,15 +30,15 @@ contract IexecOrderManagementFacet is IexecOrderManagement, FacetBase {
         address owner = IERC5313(_apporderoperation.order.app).owner();
         require(
             owner == _msgSender() ||
-                SignatureLib.verifySignature(
+                CommonLib.verifySignature(
                     owner,
-                    SignatureLib.toTypedDataHash(_apporderoperation.hash()),
+                    CommonLib.toTypedDataHash(_apporderoperation.hash()),
                     _apporderoperation.sign
                 ),
             "invalid-sender-or-signature"
         );
 
-        bytes32 apporderHash = SignatureLib.toTypedDataHash(_apporderoperation.order.hash());
+        bytes32 apporderHash = CommonLib.toTypedDataHash(_apporderoperation.order.hash());
         if (_apporderoperation.operation == IexecLibOrders_v5.OrderOperationEnum.SIGN) {
             $.m_presigned[apporderHash] = owner;
             emit SignedAppOrder(apporderHash);
@@ -55,17 +55,15 @@ contract IexecOrderManagementFacet is IexecOrderManagement, FacetBase {
         address owner = IERC5313(_datasetorderoperation.order.dataset).owner();
         require(
             owner == _msgSender() ||
-                SignatureLib.verifySignature(
+                CommonLib.verifySignature(
                     owner,
-                    SignatureLib.toTypedDataHash(_datasetorderoperation.hash()),
+                    CommonLib.toTypedDataHash(_datasetorderoperation.hash()),
                     _datasetorderoperation.sign
                 ),
             "invalid-sender-or-signature"
         );
 
-        bytes32 datasetorderHash = SignatureLib.toTypedDataHash(
-            _datasetorderoperation.order.hash()
-        );
+        bytes32 datasetorderHash = CommonLib.toTypedDataHash(_datasetorderoperation.order.hash());
         if (_datasetorderoperation.operation == IexecLibOrders_v5.OrderOperationEnum.SIGN) {
             $.m_presigned[datasetorderHash] = owner;
             emit SignedDatasetOrder(datasetorderHash);
@@ -82,15 +80,15 @@ contract IexecOrderManagementFacet is IexecOrderManagement, FacetBase {
         address owner = IERC5313(_workerpoolorderoperation.order.workerpool).owner();
         require(
             owner == _msgSender() ||
-                SignatureLib.verifySignature(
+                CommonLib.verifySignature(
                     owner,
-                    SignatureLib.toTypedDataHash(_workerpoolorderoperation.hash()),
+                    CommonLib.toTypedDataHash(_workerpoolorderoperation.hash()),
                     _workerpoolorderoperation.sign
                 ),
             "invalid-sender-or-signature"
         );
 
-        bytes32 workerpoolorderHash = SignatureLib.toTypedDataHash(
+        bytes32 workerpoolorderHash = CommonLib.toTypedDataHash(
             _workerpoolorderoperation.order.hash()
         );
         if (_workerpoolorderoperation.operation == IexecLibOrders_v5.OrderOperationEnum.SIGN) {
@@ -111,17 +109,15 @@ contract IexecOrderManagementFacet is IexecOrderManagement, FacetBase {
         address owner = _requestorderoperation.order.requester;
         require(
             owner == _msgSender() ||
-                SignatureLib.verifySignature(
+                CommonLib.verifySignature(
                     owner,
-                    SignatureLib.toTypedDataHash(_requestorderoperation.hash()),
+                    CommonLib.toTypedDataHash(_requestorderoperation.hash()),
                     _requestorderoperation.sign
                 ),
             "invalid-sender-or-signature"
         );
 
-        bytes32 requestorderHash = SignatureLib.toTypedDataHash(
-            _requestorderoperation.order.hash()
-        );
+        bytes32 requestorderHash = CommonLib.toTypedDataHash(_requestorderoperation.order.hash());
         if (_requestorderoperation.operation == IexecLibOrders_v5.OrderOperationEnum.SIGN) {
             $.m_presigned[requestorderHash] = owner;
             emit SignedRequestOrder(requestorderHash);
diff --git a/contracts/facets/IexecPoco1Facet.sol b/contracts/facets/IexecPoco1Facet.sol
index 145cca40a..4ebcc6407 100644
--- a/contracts/facets/IexecPoco1Facet.sol
+++ b/contracts/facets/IexecPoco1Facet.sol
@@ -12,8 +12,7 @@ import {PocoStorageLib} from "../libs/PocoStorageLib.sol";
 import {IexecPoco1} from "../interfaces/IexecPoco1.sol";
 import {IexecPoco1Errors} from "../interfaces/IexecPoco1Errors.sol";
 import {IexecEscrow} from "../abstract/IexecEscrow.sol";
-import {DealVolumeLib} from "../libs/DealVolumeLib.sol";
-import {SignatureLib} from "../libs/SignatureLib.sol";
+import {CommonLib} from "../libs/CommonLib.sol";
 
 struct Matching {
     bytes32 apporderHash;
@@ -41,14 +40,14 @@ contract IexecPoco1Facet is IexecPoco1, IexecPoco1Errors, IexecEscrow {
         bytes32 _hash,
         bytes calldata _signature
     ) external view override returns (bool) {
-        return SignatureLib.verifySignature(_identity, _hash, _signature);
+        return CommonLib.verifySignature(_identity, _hash, _signature);
     }
 
     function verifyPresignature(
         address _identity,
         bytes32 _hash
     ) external view override returns (bool) {
-        return SignatureLib.verifyPresignature(_identity, _hash);
+        return CommonLib.verifyPresignature(_identity, _hash);
     }
 
     function verifyPresignatureOrSignature(
@@ -56,7 +55,7 @@ contract IexecPoco1Facet is IexecPoco1, IexecPoco1Errors, IexecEscrow {
         bytes32 _hash,
         bytes calldata _signature
     ) external view override returns (bool) {
-        return SignatureLib.verifySignatureOrPresignature(_identity, _hash, _signature);
+        return CommonLib.verifySignatureOrPresignature(_identity, _hash, _signature);
     }
 
     /**
@@ -79,7 +78,7 @@ contract IexecPoco1Facet is IexecPoco1, IexecPoco1Errors, IexecEscrow {
         bytes32 dealId
     ) external view override {
         PocoStorageLib.PocoStorage storage $ = PocoStorageLib.getPocoStorage();
-        bytes32 datasetOrderHash = SignatureLib.toTypedDataHash(datasetOrder.hash());
+        bytes32 datasetOrderHash = CommonLib.toTypedDataHash(datasetOrder.hash());
         // Check if dataset order is not revoked or fully consumed.
         // Note: This should be the first check because it is the most important
         // and the most likely to occur (users revoking their dataset orders).
@@ -89,7 +88,7 @@ contract IexecPoco1Facet is IexecPoco1, IexecPoco1Errors, IexecEscrow {
         // Check dataset order signature (including presign and ERC-1271).
         address datasetOwner = IERC5313(datasetOrder.dataset).owner();
         if (
-            !SignatureLib.verifySignatureOrPresignature(
+            !CommonLib.verifySignatureOrPresignature(
                 datasetOwner,
                 datasetOrderHash,
                 datasetOrder.sign
@@ -108,16 +107,13 @@ contract IexecPoco1Facet is IexecPoco1, IexecPoco1Errors, IexecEscrow {
         }
         // The deal's app should be allowed by order restriction.
         if (
-            !SignatureLib.isAccountAuthorizedByRestriction(
-                datasetOrder.apprestrict,
-                deal.app.pointer
-            )
+            !CommonLib.isAccountAuthorizedByRestriction(datasetOrder.apprestrict, deal.app.pointer)
         ) {
             revert IncompatibleDatasetOrder("App restriction not satisfied");
         }
         // The deal's workerpool should be allowed by order restriction.
         if (
-            !SignatureLib.isAccountAuthorizedByRestriction(
+            !CommonLib.isAccountAuthorizedByRestriction(
                 datasetOrder.workerpoolrestrict,
                 deal.workerpool.pointer
             )
@@ -126,7 +122,7 @@ contract IexecPoco1Facet is IexecPoco1, IexecPoco1Errors, IexecEscrow {
         }
         // The deal's requester should be allowed by order restriction.
         if (
-            !SignatureLib.isAccountAuthorizedByRestriction(
+            !CommonLib.isAccountAuthorizedByRestriction(
                 datasetOrder.requesterrestrict,
                 deal.requester
             )
@@ -263,67 +259,64 @@ contract IexecPoco1Facet is IexecPoco1, IexecPoco1Errors, IexecEscrow {
         require(_requestorder.app == _apporder.app, "iExecV5-matchOrders-0x10");
         require(_requestorder.dataset == _datasetorder.dataset, "iExecV5-matchOrders-0x11");
         require(
-            SignatureLib.isAccountAuthorizedByRestriction(
+            CommonLib.isAccountAuthorizedByRestriction(
                 _requestorder.workerpool,
                 _workerpoolorder.workerpool
             ),
             "iExecV5-matchOrders-0x12"
         ); // requestorder.workerpool is a restriction
         require(
-            SignatureLib.isAccountAuthorizedByRestriction(
+            CommonLib.isAccountAuthorizedByRestriction(
                 _apporder.datasetrestrict,
                 _datasetorder.dataset
             ),
             "iExecV5-matchOrders-0x13"
         );
         require(
-            SignatureLib.isAccountAuthorizedByRestriction(
+            CommonLib.isAccountAuthorizedByRestriction(
                 _apporder.workerpoolrestrict,
                 _workerpoolorder.workerpool
             ),
             "iExecV5-matchOrders-0x14"
         );
         require(
-            SignatureLib.isAccountAuthorizedByRestriction(
+            CommonLib.isAccountAuthorizedByRestriction(
                 _apporder.requesterrestrict,
                 _requestorder.requester
             ),
             "iExecV5-matchOrders-0x15"
         );
         require(
-            SignatureLib.isAccountAuthorizedByRestriction(_datasetorder.apprestrict, _apporder.app),
+            CommonLib.isAccountAuthorizedByRestriction(_datasetorder.apprestrict, _apporder.app),
             "iExecV5-matchOrders-0x16"
         );
         require(
-            SignatureLib.isAccountAuthorizedByRestriction(
+            CommonLib.isAccountAuthorizedByRestriction(
                 _datasetorder.workerpoolrestrict,
                 _workerpoolorder.workerpool
             ),
             "iExecV5-matchOrders-0x17"
         );
         require(
-            SignatureLib.isAccountAuthorizedByRestriction(
+            CommonLib.isAccountAuthorizedByRestriction(
                 _datasetorder.requesterrestrict,
                 _requestorder.requester
             ),
             "iExecV5-matchOrders-0x18"
         );
         require(
-            SignatureLib.isAccountAuthorizedByRestriction(
-                _workerpoolorder.apprestrict,
-                _apporder.app
-            ),
+            CommonLib.isAccountAuthorizedByRestriction(_workerpoolorder.apprestrict, _apporder.app),
             "iExecV5-matchOrders-0x19"
         );
         require(
-            SignatureLib.isAccountAuthorizedByRestriction(
+            CommonLib.isAccountAuthorizedByRestriction(
                 _workerpoolorder.datasetrestrict,
                 _datasetorder.dataset
             ),
             "iExecV5-matchOrders-0x1a"
         );
         require(
-            SignatureLib.isAccountAuthorizedByRestriction(
+            CommonLib.isAccountAuthorizedByRestriction(
                 _workerpoolorder.requesterrestrict,
                 _requestorder.requester
             ),
@@ -338,23 +331,19 @@ contract IexecPoco1Facet is IexecPoco1, IexecPoco1Errors, IexecEscrow {
         ids.hasDataset = _datasetorder.dataset != address(0);
 
         // app
-        ids.apporderHash = SignatureLib.toTypedDataHash(_apporder.hash());
+        ids.apporderHash = CommonLib.toTypedDataHash(_apporder.hash());
         ids.appOwner = IERC5313(_apporder.app).owner();
 
         require($.m_appregistry.isRegistered(_apporder.app), "iExecV5-matchOrders-0x20");
         require(
-            SignatureLib.verifySignatureOrPresignature(
-                ids.appOwner,
-                ids.apporderHash,
-                _apporder.sign
-            ),
+            CommonLib.verifySignatureOrPresignature(ids.appOwner, ids.apporderHash, _apporder.sign),
             "iExecV5-matchOrders-0x21"
         );
 
         // dataset
         if (ids.hasDataset) {
             // only check if dataset is enabled
-            ids.datasetorderHash = SignatureLib.toTypedDataHash(_datasetorder.hash());
+            ids.datasetorderHash = CommonLib.toTypedDataHash(_datasetorder.hash());
             ids.datasetOwner = IERC5313(_datasetorder.dataset).owner();
 
             require(
@@ -362,7 +351,7 @@ contract IexecPoco1Facet is IexecPoco1, IexecPoco1Errors, IexecEscrow {
                 "iExecV5-matchOrders-0x30"
             );
             require(
-                SignatureLib.verifySignatureOrPresignature(
+                CommonLib.verifySignatureOrPresignature(
                     ids.datasetOwner,
                     ids.datasetorderHash,
                     _datasetorder.sign
@@ -372,7 +361,7 @@ contract IexecPoco1Facet is IexecPoco1, IexecPoco1Errors, IexecEscrow {
         }
 
         // workerpool
-        ids.workerpoolorderHash = SignatureLib.toTypedDataHash(_workerpoolorder.hash());
+        ids.workerpoolorderHash = CommonLib.toTypedDataHash(_workerpoolorder.hash());
         ids.workerpoolOwner = IERC5313(_workerpoolorder.workerpool).owner();
 
         require(
@@ -380,7 +369,7 @@ contract IexecPoco1Facet is IexecPoco1, IexecPoco1Errors, IexecEscrow {
             "iExecV5-matchOrders-0x40"
         );
         require(
-            SignatureLib.verifySignatureOrPresignature(
+            CommonLib.verifySignatureOrPresignature(
                 ids.workerpoolOwner,
                 ids.workerpoolorderHash,
                 _workerpoolorder.sign
@@ -389,9 +378,9 @@ contract IexecPoco1Facet is IexecPoco1, IexecPoco1Errors, IexecEscrow {
         );
 
         // request
-        ids.requestorderHash = SignatureLib.toTypedDataHash(_requestorder.hash());
+        ids.requestorderHash = CommonLib.toTypedDataHash(_requestorder.hash());
         require(
-            SignatureLib.verifySignatureOrPresignature(
+            CommonLib.verifySignatureOrPresignature(
                 _requestorder.requester,
                 ids.requestorderHash,
                 _requestorder.sign
@@ -402,7 +391,7 @@ contract IexecPoco1Facet is IexecPoco1, IexecPoco1Errors, IexecEscrow {
         /**
          * Check availability
          */
-        uint256 volume = DealVolumeLib.computeDealVolume(
+        uint256 volume = CommonLib.computeDealVolume(
             _apporder.volume,
             ids.apporderHash,
             ids.hasDataset,
diff --git a/contracts/facets/IexecPoco2Facet.sol b/contracts/facets/IexecPoco2Facet.sol
index e3f939a41..0eac27b57 100644
--- a/contracts/facets/IexecPoco2Facet.sol
+++ b/contracts/facets/IexecPoco2Facet.sol
@@ -10,7 +10,7 @@ import {IexecLibCore_v5} from "../libs/IexecLibCore_v5.sol";
 import {IexecLibOrders_v5} from "../libs/IexecLibOrders_v5.sol";
 import {IexecPoco2} from "../interfaces/IexecPoco2.sol";
 import {IexecEscrow} from "../abstract/IexecEscrow.sol";
-import {SignatureLib} from "../libs/SignatureLib.sol";
+import {CommonLib} from "../libs/CommonLib.sol";
 
 contract IexecPoco2Facet is IexecPoco2, IexecEscrow {
     modifier onlyScheduler(bytes32 _taskId) {
@@ -119,7 +119,7 @@ contract IexecPoco2Facet is IexecPoco2, IexecEscrow {
 
         // Check that the worker + taskid + enclave combo is authorized to contribute (scheduler signature)
         require(
-            SignatureLib.verifySignatureOfEthSignedMessage(
+            CommonLib.verifySignatureOfEthSignedMessage(
                 (_enclaveChallenge != address(0) && $.m_teebroker != address(0))
                     ? $.m_teebroker
                     : deal.workerpool.owner,
@@ -131,7 +131,7 @@ contract IexecPoco2Facet is IexecPoco2, IexecEscrow {
         // Check enclave signature
         require(
             _enclaveChallenge == address(0) ||
-                SignatureLib.verifySignatureOfEthSignedMessage(
+                CommonLib.verifySignatureOfEthSignedMessage(
                     _enclaveChallenge,
                     abi.encodePacked(_resultHash, _resultSeal),
                     _enclaveSign
@@ -206,7 +206,7 @@ contract IexecPoco2Facet is IexecPoco2, IexecEscrow {
 
         // Check that the worker + taskid + enclave combo is authorized to contribute (scheduler signature)
         require(
-            SignatureLib.verifySignatureOfEthSignedMessage(
+            CommonLib.verifySignatureOfEthSignedMessage(
                 (_enclaveChallenge != address(0) && $.m_teebroker != address(0))
                     ? $.m_teebroker
                     : deal.workerpool.owner,
@@ -218,7 +218,7 @@ contract IexecPoco2Facet is IexecPoco2, IexecEscrow {
         // Check enclave signature
         require(
             _enclaveChallenge == address(0) ||
-                SignatureLib.verifySignatureOfEthSignedMessage(
+                CommonLib.verifySignatureOfEthSignedMessage(
                     _enclaveChallenge,
                     abi.encodePacked(resultHash, resultSeal),
                     _enclaveSign
diff --git a/contracts/facets/IexecPocoAccessorsFacet.sol b/contracts/facets/IexecPocoAccessorsFacet.sol
index 021a00b6d..f4c0bc5fc 100644
--- a/contracts/facets/IexecPocoAccessorsFacet.sol
+++ b/contracts/facets/IexecPocoAccessorsFacet.sol
@@ -11,9 +11,8 @@ import {IApp} from "../registries/apps/IApp.v8.sol";
 import {IWorkerpool} from "../registries/workerpools/IWorkerpool.v8.sol";
 import {IexecPocoAccessors} from "../interfaces/IexecPocoAccessors.sol";
 import {IRegistry} from "../registries/IRegistry.sol";
-import {DealVolumeLib} from "../libs/DealVolumeLib.sol";
 import {FacetBase} from "../abstract/FacetBase.sol";
-import {SignatureLib} from "../libs/SignatureLib.sol";
+import {CommonLib} from "../libs/CommonLib.sol";
 
 /**
  * @title Getters contract for PoCo facets.
@@ -61,16 +60,16 @@ contract IexecPocoAccessorsFacet is IexecPocoAccessors, FacetBase {
         IexecLibOrders_v5.RequestOrder calldata requestOrder
     ) external view override returns (uint256) {
         return
-            DealVolumeLib.computeDealVolume(
+            CommonLib.computeDealVolume(
                 appOrder.volume,
-                SignatureLib.toTypedDataHash(appOrder.hash()),
+                CommonLib.toTypedDataHash(appOrder.hash()),
                 datasetOrder.dataset != address(0),
                 datasetOrder.volume,
-                SignatureLib.toTypedDataHash(datasetOrder.hash()),
+                CommonLib.toTypedDataHash(datasetOrder.hash()),
                 workerpoolOrder.volume,
-                SignatureLib.toTypedDataHash(workerpoolOrder.hash()),
+                CommonLib.toTypedDataHash(workerpoolOrder.hash()),
                 requestOrder.volume,
-                SignatureLib.toTypedDataHash(requestOrder.hash())
+                CommonLib.toTypedDataHash(requestOrder.hash())
             );
     }
 
diff --git a/contracts/facets/IexecPocoBoostFacet.sol b/contracts/facets/IexecPocoBoostFacet.sol
index 8d50c5ab2..6857a0cde 100644
--- a/contracts/facets/IexecPocoBoostFacet.sol
+++ b/contracts/facets/IexecPocoBoostFacet.sol
@@ -15,9 +15,8 @@ import {IexecLibOrders_v5} from "../libs/IexecLibOrders_v5.sol";
 import {IWorkerpool} from "../registries/workerpools/IWorkerpool.v8.sol";
 import {IexecPocoBoost} from "../interfaces/IexecPocoBoost.sol";
 import {IexecEscrow} from "../abstract/IexecEscrow.sol";
-import {DealVolumeLib} from "../libs/DealVolumeLib.sol";
 import {PocoStorageLib} from "../libs/PocoStorageLib.sol";
-import {SignatureLib} from "../libs/SignatureLib.sol";
+import {CommonLib} from "../libs/CommonLib.sol";
 
 //
 // Not deployed yet!
@@ -161,50 +160,44 @@ contract IexecPocoBoostFacet is IexecPocoBoost, IexecEscrow {
         // Check all possible restrictions.
         address workerpool = workerpoolOrder.workerpool;
         require(
-            SignatureLib.isAccountAuthorizedByRestriction(requestOrder.workerpool, workerpool),
+            CommonLib.isAccountAuthorizedByRestriction(requestOrder.workerpool, workerpool),
             "PocoBoost: Workerpool restricted by request order"
         );
         require(
-            SignatureLib.isAccountAuthorizedByRestriction(appOrder.datasetrestrict, dataset),
+            CommonLib.isAccountAuthorizedByRestriction(appOrder.datasetrestrict, dataset),
             "PocoBoost: Dataset restricted by app order"
         );
         require(
-            SignatureLib.isAccountAuthorizedByRestriction(appOrder.workerpoolrestrict, workerpool),
+            CommonLib.isAccountAuthorizedByRestriction(appOrder.workerpoolrestrict, workerpool),
             "PocoBoost: Workerpool restricted by app order"
         );
         address requester = requestOrder.requester;
         require(
-            SignatureLib.isAccountAuthorizedByRestriction(appOrder.requesterrestrict, requester),
+            CommonLib.isAccountAuthorizedByRestriction(appOrder.requesterrestrict, requester),
             "PocoBoost: Requester restricted by app order"
         );
         require(
-            SignatureLib.isAccountAuthorizedByRestriction(datasetOrder.apprestrict, app),
+            CommonLib.isAccountAuthorizedByRestriction(datasetOrder.apprestrict, app),
             "PocoBoost: App restricted by dataset order"
         );
         require(
-            SignatureLib.isAccountAuthorizedByRestriction(
-                datasetOrder.workerpoolrestrict,
-                workerpool
-            ),
+            CommonLib.isAccountAuthorizedByRestriction(datasetOrder.workerpoolrestrict, workerpool),
             "PocoBoost: Workerpool restricted by dataset order"
         );
         require(
-            SignatureLib.isAccountAuthorizedByRestriction(
-                datasetOrder.requesterrestrict,
-                requester
-            ),
+            CommonLib.isAccountAuthorizedByRestriction(datasetOrder.requesterrestrict, requester),
             "PocoBoost: Requester restricted by dataset order"
         );
         require(
-            SignatureLib.isAccountAuthorizedByRestriction(workerpoolOrder.apprestrict, app),
+            CommonLib.isAccountAuthorizedByRestriction(workerpoolOrder.apprestrict, app),
             "PocoBoost: App restricted by workerpool order"
         );
         require(
-            SignatureLib.isAccountAuthorizedByRestriction(workerpoolOrder.datasetrestrict, dataset),
+            CommonLib.isAccountAuthorizedByRestriction(workerpoolOrder.datasetrestrict, dataset),
             "PocoBoost: Dataset restricted by workerpool order"
         );
         require(
-            SignatureLib.isAccountAuthorizedByRestriction(
+            CommonLib.isAccountAuthorizedByRestriction(
                 workerpoolOrder.requesterrestrict,
                 requester
             ),
@@ -213,13 +206,9 @@ contract IexecPocoBoostFacet is IexecPocoBoost, IexecEscrow {
         // Check ownership, registration, and signatures for app and dataset.
         require($.m_appregistry.isRegistered(app), "PocoBoost: App not registered");
         address appOwner = IERC5313(app).owner();
-        bytes32 appOrderTypedDataHash = SignatureLib.toTypedDataHash(appOrder.hash());
+        bytes32 appOrderTypedDataHash = CommonLib.toTypedDataHash(appOrder.hash());
         require(
-            SignatureLib.verifySignatureOrPresignature(
-                appOwner,
-                appOrderTypedDataHash,
-                appOrder.sign
-            ),
+            CommonLib.verifySignatureOrPresignature(appOwner, appOrderTypedDataHash, appOrder.sign),
             "PocoBoost: Invalid app order signature"
         );
         bool hasDataset = dataset != address(0);
@@ -228,9 +217,9 @@ contract IexecPocoBoostFacet is IexecPocoBoost, IexecEscrow {
         if (hasDataset) {
             require($.m_datasetregistry.isRegistered(dataset), "PocoBoost: Dataset not registered");
             datasetOwner = IERC5313(dataset).owner();
-            datasetOrderTypedDataHash = SignatureLib.toTypedDataHash(datasetOrder.hash());
+            datasetOrderTypedDataHash = CommonLib.toTypedDataHash(datasetOrder.hash());
             require(
-                SignatureLib.verifySignatureOrPresignature(
+                CommonLib.verifySignatureOrPresignature(
                     datasetOwner,
                     datasetOrderTypedDataHash,
                     datasetOrder.sign
@@ -244,18 +233,18 @@ contract IexecPocoBoostFacet is IexecPocoBoost, IexecEscrow {
             "PocoBoost: Workerpool not registered"
         );
         address workerpoolOwner = IERC5313(workerpool).owner();
-        bytes32 workerpoolOrderTypedDataHash = SignatureLib.toTypedDataHash(workerpoolOrder.hash());
+        bytes32 workerpoolOrderTypedDataHash = CommonLib.toTypedDataHash(workerpoolOrder.hash());
         require(
-            SignatureLib.verifySignatureOrPresignature(
+            CommonLib.verifySignatureOrPresignature(
                 workerpoolOwner,
                 workerpoolOrderTypedDataHash,
                 workerpoolOrder.sign
             ),
             "PocoBoost: Invalid workerpool order signature"
         );
-        bytes32 requestOrderTypedDataHash = SignatureLib.toTypedDataHash(requestOrder.hash());
+        bytes32 requestOrderTypedDataHash = CommonLib.toTypedDataHash(requestOrder.hash());
         require(
-            SignatureLib.verifySignatureOrPresignature(
+            CommonLib.verifySignatureOrPresignature(
                 requester,
                 requestOrderTypedDataHash,
                 requestOrder.sign
@@ -285,7 +274,7 @@ contract IexecPocoBoostFacet is IexecPocoBoost, IexecEscrow {
          *   - but trying to use as little gas as possible
          * - Overflows: Solidity 0.8 has built in overflow checking
          */
-        uint256 volume = DealVolumeLib.computeDealVolume(
+        uint256 volume = CommonLib.computeDealVolume(
             appOrder.volume,
             appOrderTypedDataHash,
             hasDataset,
@@ -411,7 +400,7 @@ contract IexecPocoBoostFacet is IexecPocoBoost, IexecEscrow {
         address workerpoolOwner = deal.workerpoolOwner;
         // Check scheduler or TEE broker signature
         require(
-            SignatureLib.verifySignatureOfEthSignedMessage(
+            CommonLib.verifySignatureOfEthSignedMessage(
                 enclaveChallenge != address(0) && $.m_teebroker != address(0)
                     ? $.m_teebroker
                     : workerpoolOwner,
@@ -424,7 +413,7 @@ contract IexecPocoBoostFacet is IexecPocoBoost, IexecEscrow {
         // Check enclave signature
         require(
             enclaveChallenge == address(0) ||
-                SignatureLib.verifySignatureOfEthSignedMessage(
+                CommonLib.verifySignatureOfEthSignedMessage(
                     enclaveChallenge,
                     abi.encodePacked(
                         msg.sender,
diff --git a/contracts/libs/SignatureLib.sol b/contracts/libs/CommonLib.sol
similarity index 74%
rename from contracts/libs/SignatureLib.sol
rename to contracts/libs/CommonLib.sol
index 29d3de380..bc38622c3 100644
--- a/contracts/libs/SignatureLib.sol
+++ b/contracts/libs/CommonLib.sol
@@ -6,14 +6,17 @@ pragma solidity ^0.8.0;
 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 {Math} from "@openzeppelin/contracts/utils/math/Math.sol";
 import {IERC734} from "../external/interfaces/IERC734.sol";
 import {PocoStorageLib} from "./PocoStorageLib.sol";
 
 /**
- * @title Verify order and contribution signatures, presignatures and restrictions.
+ * @title Helpers shared by the PoCo facets: signature verification, address
+ * restrictions and deal volume computation.
  */
-library SignatureLib {
+library CommonLib {
     using ECDSA for bytes32;
+    using Math for uint256;
 
     // Used with ERC-734 Key Manager identity contract for authorization management.
     uint256 private constant GROUPMEMBER_PURPOSE = 4;
@@ -152,4 +155,43 @@ library SignatureLib {
         }
         return false;
     }
+
+    /**
+     * @notice Compute the deal volume considering the minimum remaining volume
+     * across all provided orders. This ensures that the deal volume does not
+     * exceed the available volume of any individual order.
+     *
+     * @param appOrderVolume The volume of the app order.
+     * @param appOrderTypedDataHash The typed data hash of the app order.
+     * @param hasDataset Indicates if there is a dataset order.
+     * @param datasetOrderVolume The volume of the dataset order.
+     * @param datasetOrderTypedDataHash The typed data hash of the dataset order.
+     * @param workerpoolOrderVolume The volume of the workerpool order.
+     * @param workerpoolOrderTypedDataHash The typed data hash of the workerpool order.
+     * @param requestOrderVolume The volume of the request order.
+     * @param requestOrderTypedDataHash The typed data hash of the request order.
+     * @return The minimum volume available across all orders.
+     */
+    function computeDealVolume(
+        uint256 appOrderVolume,
+        bytes32 appOrderTypedDataHash,
+        bool hasDataset,
+        uint256 datasetOrderVolume,
+        bytes32 datasetOrderTypedDataHash,
+        uint256 workerpoolOrderVolume,
+        bytes32 workerpoolOrderTypedDataHash,
+        uint256 requestOrderVolume,
+        bytes32 requestOrderTypedDataHash
+    ) internal view returns (uint256) {
+        PocoStorageLib.PocoStorage storage $ = PocoStorageLib.getPocoStorage();
+        return
+            (appOrderVolume - $.m_consumed[appOrderTypedDataHash])
+                .min(
+                    hasDataset
+                        ? datasetOrderVolume - $.m_consumed[datasetOrderTypedDataHash]
+                        : type(uint256).max
+                )
+                .min(workerpoolOrderVolume - $.m_consumed[workerpoolOrderTypedDataHash])
+                .min(requestOrderVolume - $.m_consumed[requestOrderTypedDataHash]);
+    }
 }
diff --git a/contracts/libs/DealVolumeLib.sol b/contracts/libs/DealVolumeLib.sol
deleted file mode 100644
index 8fb63289e..000000000
--- a/contracts/libs/DealVolumeLib.sol
+++ /dev/null
@@ -1,53 +0,0 @@
-// SPDX-FileCopyrightText: 2024-2025 IEXEC BLOCKCHAIN TECH <contact@iex.ec>
-// SPDX-License-Identifier: Apache-2.0
-
-pragma solidity ^0.8.0;
-
-import {Math} from "@openzeppelin/contracts/utils/math/Math.sol";
-import {PocoStorageLib} from "./PocoStorageLib.sol";
-
-/**
- * @title Compute the volume of a deal from the volumes of the orders it matches.
- */
-library DealVolumeLib {
-    using Math for uint256;
-
-    /**
-     * @notice Compute the deal volume considering the minimum remaining volume
-     * across all provided orders. This ensures that the deal volume does not
-     * exceed the available volume of any individual order.
-     *
-     * @param appOrderVolume The volume of the app order.
-     * @param appOrderTypedDataHash The typed data hash of the app order.
-     * @param hasDataset Indicates if there is a dataset order.
-     * @param datasetOrderVolume The volume of the dataset order.
-     * @param datasetOrderTypedDataHash The typed data hash of the dataset order.
-     * @param workerpoolOrderVolume The volume of the workerpool order.
-     * @param workerpoolOrderTypedDataHash The typed data hash of the workerpool order.
-     * @param requestOrderVolume The volume of the request order.
-     * @param requestOrderTypedDataHash The typed data hash of the request order.
-     * @return The minimum volume available across all orders.
-     */
-    function computeDealVolume(
-        uint256 appOrderVolume,
-        bytes32 appOrderTypedDataHash,
-        bool hasDataset,
-        uint256 datasetOrderVolume,
-        bytes32 datasetOrderTypedDataHash,
-        uint256 workerpoolOrderVolume,
-        bytes32 workerpoolOrderTypedDataHash,
-        uint256 requestOrderVolume,
-        bytes32 requestOrderTypedDataHash
-    ) internal view returns (uint256) {
-        PocoStorageLib.PocoStorage storage $ = PocoStorageLib.getPocoStorage();
-        return
-            (appOrderVolume - $.m_consumed[appOrderTypedDataHash])
-                .min(
-                    hasDataset
-                        ? datasetOrderVolume - $.m_consumed[datasetOrderTypedDataHash]
-                        : type(uint256).max
-                )
-                .min(workerpoolOrderVolume - $.m_consumed[workerpoolOrderTypedDataHash])
-                .min(requestOrderVolume - $.m_consumed[requestOrderTypedDataHash]);
-    }
-}
diff --git a/hardhat.config.ts b/hardhat.config.ts
index 74bf9e0b5..5ad7052ca 100644
--- a/hardhat.config.ts
+++ b/hardhat.config.ts
@@ -170,8 +170,7 @@ const config: HardhatUserConfig = {
             'facets/IexecAccessorsABILegacyFacet.sol', // not relevant
             // TODO: put all events and soldoc inside interfaces and use them instead of contracts.
             'interfaces/', // interesting for events but too much doc duplication if enabled
-            'libs/DealVolumeLib.sol', // contains only internal/private
-            'libs/SignatureLib.sol', // contains only internal/private
+            'libs/CommonLib.sol', // contains only internal/private
             'tools/',
             'Diamond.sol', // not relevant
         ],

From bad00efd6a06d6267b3cea33dad92542a8ffa935 Mon Sep 17 00:00:00 2001
From: Zied <26070035+zguesmi@users.noreply.github.com>
Date: Tue, 1 Sep 2026 15:49:38 +0200
Subject: [PATCH 08/17] chore: record the pending renames as TODOs

The library and facet names still carry suffixes the next PR removes:
IexecLibCore_v5 becomes CoreLib, IexecLibOrders_v5 becomes OrdersLib and
IexecEscrowTokenFacet becomes IexecEscrowFacet. IexecInterfaceToken
already carried its own note.
---
 contracts/facets/IexecEscrowTokenFacet.sol | 1 +
 contracts/libs/IexecLibCore_v5.sol         | 1 +
 contracts/libs/IexecLibOrders_v5.sol       | 1 +
 3 files changed, 3 insertions(+)

diff --git a/contracts/facets/IexecEscrowTokenFacet.sol b/contracts/facets/IexecEscrowTokenFacet.sol
index cbc21929a..3305c1f47 100644
--- a/contracts/facets/IexecEscrowTokenFacet.sol
+++ b/contracts/facets/IexecEscrowTokenFacet.sol
@@ -23,6 +23,7 @@ import {PocoStorageLib} from "../libs/PocoStorageLib.sol";
  * RLC, and the ERC-20 methods move it between accounts. The balance moves of the
  * escrow itself (lock, unlock, reward, seize) run over the same ledger.
  */
+// TODO rename to IexecEscrowFacet
 contract IexecEscrowTokenFacet is IexecEscrowToken, IexecTokenSpender, IexecEscrow {
     /***************************************************************************
      *                     Deposit and withdraw functions                      *
diff --git a/contracts/libs/IexecLibCore_v5.sol b/contracts/libs/IexecLibCore_v5.sol
index aca6f5f40..d77746fac 100644
--- a/contracts/libs/IexecLibCore_v5.sol
+++ b/contracts/libs/IexecLibCore_v5.sol
@@ -3,6 +3,7 @@
 
 pragma solidity ^0.8.0;
 
+// TODO rename to CoreLib
 library IexecLibCore_v5 {
     /**
      * Tools
diff --git a/contracts/libs/IexecLibOrders_v5.sol b/contracts/libs/IexecLibOrders_v5.sol
index a5ba8b13f..587e93089 100644
--- a/contracts/libs/IexecLibOrders_v5.sol
+++ b/contracts/libs/IexecLibOrders_v5.sol
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 pragma solidity ^0.8.0;
+// TODO rename to OrdersLib
 library IexecLibOrders_v5 {
     // bytes32 public constant EIP712DOMAIN_TYPEHASH = keccak256('EIP712Domain(string name,string version,uint256 chainId,address verifyingContract)');
     // bytes32 public constant APPORDER_TYPEHASH = keccak256('AppOrder(address app,uint256 appprice,uint256 volume,bytes32 tag,address datasetrestrict,address workerpoolrestrict,address requesterrestrict,bytes32 salt)');

From 19345257b6170b3a538a5cc0800ec60dcbae1009 Mon Sep 17 00:00:00 2001
From: Zied <26070035+zguesmi@users.noreply.github.com>
Date: Tue, 1 Sep 2026 15:56:52 +0200
Subject: [PATCH 09/17] chore: clean

---
 contracts/libs/CommonLib.sol | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contracts/libs/CommonLib.sol b/contracts/libs/CommonLib.sol
index bc38622c3..d394735e0 100644
--- a/contracts/libs/CommonLib.sol
+++ b/contracts/libs/CommonLib.sol
@@ -11,8 +11,8 @@ import {IERC734} from "../external/interfaces/IERC734.sol";
 import {PocoStorageLib} from "./PocoStorageLib.sol";
 
 /**
- * @title Helpers shared by the PoCo facets: signature verification, address
- * restrictions and deal volume computation.
+ * @title Helpers shared by the PoCo facets (signature verification, address
+ * restriction checks, deal volume computation, ...)
  */
 library CommonLib {
     using ECDSA for bytes32;

From d02c9dfb086a771f333636ccacc6dc5151b4fb51 Mon Sep 17 00:00:00 2001
From: Zied <26070035+zguesmi@users.noreply.github.com>
Date: Tue, 1 Sep 2026 16:06:12 +0200
Subject: [PATCH 10/17] refactor: convert IexecEscrow to the EscrowLib library

The last of the three stateless helpers over diamond storage leaves
contracts/abstract/, which now holds FacetBase alone. The four facets that
inherited the escrow declare FacetBase directly instead; each of them uses
it. IexecEscrowTestContract becomes a plain wrapper around the library.

The library declares the five events it emits. solc 0.8.21 cannot compile a
qualified `emit IexecEscrowEvents.Lock(...)` when userdoc is requested and
docgen always requests it, so a second declaration is the only option;
IexecEscrowEvents stays as the declaration that feeds IexecInterfaceToken,
whose ABI is unchanged.

Events now follow the emit path, so the dead entries disappear from the
facet ABIs: IexecPoco1Facet drops from six events to Transfer and Lock,
and IexecPoco2Facet and IexecPocoBoostFacet drop Approval.

IexecEscrowTokenFacet is the exception. It reaches the events through
IexecEscrowToken and also emits Transfer through the library, so its ABI
lists Transfer twice and typechain generates 14 duplicate-identifier
errors for it. Moving _mint, _burn and _approve into the library removes
the duplicate; that is recorded as a TODO on the contract and deferred to
the next PR.

The members lose their leading underscores, which marked them as internal
to a contract, so _transfer is now EscrowLib.transfer. The revert strings
still read "IexecEscrow: ..." because tests assert on them.
---
 .../facets/IexecEscrowTokenFacet.json         | 25 +++++
 abis/contracts/facets/IexecPoco1Facet.json    | 94 -------------------
 abis/contracts/facets/IexecPoco2Facet.json    | 25 -----
 .../contracts/facets/IexecPocoBoostFacet.json | 25 -----
 .../IexecEscrow.json => libs/EscrowLib.json}  | 25 -----
 .../IexecEscrowTokenFacet.json                |  1 +
 .../IexecPoco1Facet.sol/IexecPoco1Facet.json  |  4 -
 .../IexecPoco2Facet.sol/IexecPoco2Facet.json  |  1 -
 .../IexecPocoBoostFacet.json                  |  1 -
 .../EscrowLib.sol/EscrowLib.json}             |  1 -
 .../IexecEscrowTestContract.json              |  1 -
 .../IexecPocoBoostCompositeFacet.json         |  1 -
 .../testing/slither/Slither.sol/Slither.json  |  1 -
 .../SlitherBoost.sol/SlitherBoost.json        |  1 -
 contracts/facets/IexecEscrowTokenFacet.sol    | 13 ++-
 contracts/facets/IexecPoco1Facet.sol          | 12 ++-
 contracts/facets/IexecPoco2Facet.sol          | 39 ++++----
 contracts/facets/IexecPocoBoostFacet.sol      | 32 ++++---
 .../IexecEscrow.sol => libs/EscrowLib.sol}    | 30 +++---
 .../tools/testing/IexecEscrowTestContract.sol | 14 +--
 20 files changed, 107 insertions(+), 239 deletions(-)
 rename abis/contracts/{abstract/IexecEscrow.json => libs/EscrowLib.json} (81%)
 rename abis/human-readable-abis/contracts/{abstract/IexecEscrow.sol/IexecEscrow.json => libs/EscrowLib.sol/EscrowLib.json} (78%)
 rename contracts/{abstract/IexecEscrow.sol => libs/EscrowLib.sol} (77%)

diff --git a/abis/contracts/facets/IexecEscrowTokenFacet.json b/abis/contracts/facets/IexecEscrowTokenFacet.json
index 94c219396..d7d8980b0 100644
--- a/abis/contracts/facets/IexecEscrowTokenFacet.json
+++ b/abis/contracts/facets/IexecEscrowTokenFacet.json
@@ -139,6 +139,31 @@
     "name": "Transfer",
     "type": "event"
   },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "from",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "to",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "value",
+        "type": "uint256"
+      }
+    ],
+    "name": "Transfer",
+    "type": "event"
+  },
   {
     "anonymous": false,
     "inputs": [
diff --git a/abis/contracts/facets/IexecPoco1Facet.json b/abis/contracts/facets/IexecPoco1Facet.json
index 04119f496..e72e4b473 100644
--- a/abis/contracts/facets/IexecPoco1Facet.json
+++ b/abis/contracts/facets/IexecPoco1Facet.json
@@ -10,31 +10,6 @@
     "name": "IncompatibleDatasetOrder",
     "type": "error"
   },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "owner",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "spender",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "value",
-        "type": "uint256"
-      }
-    ],
-    "name": "Approval",
-    "type": "event"
-  },
   {
     "anonymous": false,
     "inputs": [
@@ -116,31 +91,6 @@
     "name": "OrdersMatched",
     "type": "event"
   },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "address",
-        "name": "owner",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      },
-      {
-        "indexed": false,
-        "internalType": "bytes32",
-        "name": "ref",
-        "type": "bytes32"
-      }
-    ],
-    "name": "Reward",
-    "type": "event"
-  },
   {
     "anonymous": false,
     "inputs": [
@@ -160,31 +110,6 @@
     "name": "SchedulerNotice",
     "type": "event"
   },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "address",
-        "name": "owner",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      },
-      {
-        "indexed": false,
-        "internalType": "bytes32",
-        "name": "ref",
-        "type": "bytes32"
-      }
-    ],
-    "name": "Seize",
-    "type": "event"
-  },
   {
     "anonymous": false,
     "inputs": [
@@ -210,25 +135,6 @@
     "name": "Transfer",
     "type": "event"
   },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "address",
-        "name": "owner",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "Unlock",
-    "type": "event"
-  },
   {
     "inputs": [
       {
diff --git a/abis/contracts/facets/IexecPoco2Facet.json b/abis/contracts/facets/IexecPoco2Facet.json
index c5dd7eb13..e379af17d 100644
--- a/abis/contracts/facets/IexecPoco2Facet.json
+++ b/abis/contracts/facets/IexecPoco2Facet.json
@@ -23,31 +23,6 @@
     "name": "AccurateContribution",
     "type": "event"
   },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "owner",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "spender",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "value",
-        "type": "uint256"
-      }
-    ],
-    "name": "Approval",
-    "type": "event"
-  },
   {
     "anonymous": false,
     "inputs": [
diff --git a/abis/contracts/facets/IexecPocoBoostFacet.json b/abis/contracts/facets/IexecPocoBoostFacet.json
index f4e8ddc06..753f46048 100644
--- a/abis/contracts/facets/IexecPocoBoostFacet.json
+++ b/abis/contracts/facets/IexecPocoBoostFacet.json
@@ -15,31 +15,6 @@
     "name": "SafeCastOverflowedUintDowncast",
     "type": "error"
   },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "owner",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "spender",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "value",
-        "type": "uint256"
-      }
-    ],
-    "name": "Approval",
-    "type": "event"
-  },
   {
     "anonymous": false,
     "inputs": [
diff --git a/abis/contracts/abstract/IexecEscrow.json b/abis/contracts/libs/EscrowLib.json
similarity index 81%
rename from abis/contracts/abstract/IexecEscrow.json
rename to abis/contracts/libs/EscrowLib.json
index 0c2a6141e..f8f92b4b0 100644
--- a/abis/contracts/abstract/IexecEscrow.json
+++ b/abis/contracts/libs/EscrowLib.json
@@ -1,29 +1,4 @@
 [
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "owner",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "spender",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "value",
-        "type": "uint256"
-      }
-    ],
-    "name": "Approval",
-    "type": "event"
-  },
   {
     "anonymous": false,
     "inputs": [
diff --git a/abis/human-readable-abis/contracts/facets/IexecEscrowTokenFacet.sol/IexecEscrowTokenFacet.json b/abis/human-readable-abis/contracts/facets/IexecEscrowTokenFacet.sol/IexecEscrowTokenFacet.json
index 31b0d5cc0..35fad85c2 100644
--- a/abis/human-readable-abis/contracts/facets/IexecEscrowTokenFacet.sol/IexecEscrowTokenFacet.json
+++ b/abis/human-readable-abis/contracts/facets/IexecEscrowTokenFacet.sol/IexecEscrowTokenFacet.json
@@ -7,6 +7,7 @@
   "event Reward(address,uint256,bytes32)",
   "event Seize(address,uint256,bytes32)",
   "event Transfer(address indexed,address indexed,uint256)",
+  "event Transfer(address indexed,address indexed,uint256)",
   "event Unlock(address,uint256)",
   "function approve(address,uint256) returns (bool)",
   "function approveAndCall(address,uint256,bytes) returns (bool)",
diff --git a/abis/human-readable-abis/contracts/facets/IexecPoco1Facet.sol/IexecPoco1Facet.json b/abis/human-readable-abis/contracts/facets/IexecPoco1Facet.sol/IexecPoco1Facet.json
index 4cd2ca141..0ac7214c8 100644
--- a/abis/human-readable-abis/contracts/facets/IexecPoco1Facet.sol/IexecPoco1Facet.json
+++ b/abis/human-readable-abis/contracts/facets/IexecPoco1Facet.sol/IexecPoco1Facet.json
@@ -1,14 +1,10 @@
 [
   "error IncompatibleDatasetOrder(string)",
-  "event Approval(address indexed,address indexed,uint256)",
   "event DealSponsored(bytes32,address)",
   "event Lock(address,uint256)",
   "event OrdersMatched(bytes32,bytes32,bytes32,bytes32,bytes32,uint256)",
-  "event Reward(address,uint256,bytes32)",
   "event SchedulerNotice(address indexed,bytes32)",
-  "event Seize(address,uint256,bytes32)",
   "event Transfer(address indexed,address indexed,uint256)",
-  "event Unlock(address,uint256)",
   "function assertDatasetDealCompatibility(tuple(address,uint256,uint256,bytes32,address,address,address,bytes32,bytes),bytes32) view",
   "function matchOrders(tuple(address,uint256,uint256,bytes32,address,address,address,bytes32,bytes),tuple(address,uint256,uint256,bytes32,address,address,address,bytes32,bytes),tuple(address,uint256,uint256,bytes32,uint256,uint256,address,address,address,bytes32,bytes),tuple(address,uint256,address,uint256,address,uint256,address,uint256,bytes32,uint256,uint256,address,address,string,bytes32,bytes)) returns (bytes32)",
   "function sponsorMatchOrders(tuple(address,uint256,uint256,bytes32,address,address,address,bytes32,bytes),tuple(address,uint256,uint256,bytes32,address,address,address,bytes32,bytes),tuple(address,uint256,uint256,bytes32,uint256,uint256,address,address,address,bytes32,bytes),tuple(address,uint256,address,uint256,address,uint256,address,uint256,bytes32,uint256,uint256,address,address,string,bytes32,bytes)) returns (bytes32)",
diff --git a/abis/human-readable-abis/contracts/facets/IexecPoco2Facet.sol/IexecPoco2Facet.json b/abis/human-readable-abis/contracts/facets/IexecPoco2Facet.sol/IexecPoco2Facet.json
index 00476c8a4..19ef5ebb3 100644
--- a/abis/human-readable-abis/contracts/facets/IexecPoco2Facet.sol/IexecPoco2Facet.json
+++ b/abis/human-readable-abis/contracts/facets/IexecPoco2Facet.sol/IexecPoco2Facet.json
@@ -1,7 +1,6 @@
 [
   "error MathOverflowedMulDiv()",
   "event AccurateContribution(address indexed,bytes32 indexed)",
-  "event Approval(address indexed,address indexed,uint256)",
   "event FaultyContribution(address indexed,bytes32 indexed)",
   "event Lock(address,uint256)",
   "event Reward(address,uint256,bytes32)",
diff --git a/abis/human-readable-abis/contracts/facets/IexecPocoBoostFacet.sol/IexecPocoBoostFacet.json b/abis/human-readable-abis/contracts/facets/IexecPocoBoostFacet.sol/IexecPocoBoostFacet.json
index c6025282e..a9b60c326 100644
--- a/abis/human-readable-abis/contracts/facets/IexecPocoBoostFacet.sol/IexecPocoBoostFacet.json
+++ b/abis/human-readable-abis/contracts/facets/IexecPocoBoostFacet.sol/IexecPocoBoostFacet.json
@@ -1,6 +1,5 @@
 [
   "error SafeCastOverflowedUintDowncast(uint8,uint256)",
-  "event Approval(address indexed,address indexed,uint256)",
   "event DealSponsoredBoost(bytes32,address)",
   "event Lock(address,uint256)",
   "event OrdersMatched(bytes32,bytes32,bytes32,bytes32,bytes32,uint256)",
diff --git a/abis/human-readable-abis/contracts/abstract/IexecEscrow.sol/IexecEscrow.json b/abis/human-readable-abis/contracts/libs/EscrowLib.sol/EscrowLib.json
similarity index 78%
rename from abis/human-readable-abis/contracts/abstract/IexecEscrow.sol/IexecEscrow.json
rename to abis/human-readable-abis/contracts/libs/EscrowLib.sol/EscrowLib.json
index ca70d06c7..1c6711547 100644
--- a/abis/human-readable-abis/contracts/abstract/IexecEscrow.sol/IexecEscrow.json
+++ b/abis/human-readable-abis/contracts/libs/EscrowLib.sol/EscrowLib.json
@@ -1,5 +1,4 @@
 [
-  "event Approval(address indexed,address indexed,uint256)",
   "event Lock(address,uint256)",
   "event Reward(address,uint256,bytes32)",
   "event Seize(address,uint256,bytes32)",
diff --git a/abis/human-readable-abis/contracts/tools/testing/IexecEscrowTestContract.sol/IexecEscrowTestContract.json b/abis/human-readable-abis/contracts/tools/testing/IexecEscrowTestContract.sol/IexecEscrowTestContract.json
index a52f7811a..8ba4f7fbf 100644
--- a/abis/human-readable-abis/contracts/tools/testing/IexecEscrowTestContract.sol/IexecEscrowTestContract.json
+++ b/abis/human-readable-abis/contracts/tools/testing/IexecEscrowTestContract.sol/IexecEscrowTestContract.json
@@ -1,5 +1,4 @@
 [
-  "event Approval(address indexed,address indexed,uint256)",
   "event Lock(address,uint256)",
   "event Reward(address,uint256,bytes32)",
   "event Seize(address,uint256,bytes32)",
diff --git a/abis/human-readable-abis/contracts/tools/testing/IexecPocoBoostCompositeFacet.sol/IexecPocoBoostCompositeFacet.json b/abis/human-readable-abis/contracts/tools/testing/IexecPocoBoostCompositeFacet.sol/IexecPocoBoostCompositeFacet.json
index 7570d62e0..c05089d16 100644
--- a/abis/human-readable-abis/contracts/tools/testing/IexecPocoBoostCompositeFacet.sol/IexecPocoBoostCompositeFacet.json
+++ b/abis/human-readable-abis/contracts/tools/testing/IexecPocoBoostCompositeFacet.sol/IexecPocoBoostCompositeFacet.json
@@ -1,6 +1,5 @@
 [
   "error SafeCastOverflowedUintDowncast(uint8,uint256)",
-  "event Approval(address indexed,address indexed,uint256)",
   "event DealSponsoredBoost(bytes32,address)",
   "event Lock(address,uint256)",
   "event OrdersMatched(bytes32,bytes32,bytes32,bytes32,bytes32,uint256)",
diff --git a/abis/human-readable-abis/contracts/tools/testing/slither/Slither.sol/Slither.json b/abis/human-readable-abis/contracts/tools/testing/slither/Slither.sol/Slither.json
index a96ed7baf..64a34952a 100644
--- a/abis/human-readable-abis/contracts/tools/testing/slither/Slither.sol/Slither.json
+++ b/abis/human-readable-abis/contracts/tools/testing/slither/Slither.sol/Slither.json
@@ -2,7 +2,6 @@
   "error IncompatibleDatasetOrder(string)",
   "error MathOverflowedMulDiv()",
   "event AccurateContribution(address indexed,bytes32 indexed)",
-  "event Approval(address indexed,address indexed,uint256)",
   "event DealSponsored(bytes32,address)",
   "event FaultyContribution(address indexed,bytes32 indexed)",
   "event Lock(address,uint256)",
diff --git a/abis/human-readable-abis/contracts/tools/testing/slither/SlitherBoost.sol/SlitherBoost.json b/abis/human-readable-abis/contracts/tools/testing/slither/SlitherBoost.sol/SlitherBoost.json
index b5161b0f3..02b2f7a96 100644
--- a/abis/human-readable-abis/contracts/tools/testing/slither/SlitherBoost.sol/SlitherBoost.json
+++ b/abis/human-readable-abis/contracts/tools/testing/slither/SlitherBoost.sol/SlitherBoost.json
@@ -1,6 +1,5 @@
 [
   "error SafeCastOverflowedUintDowncast(uint8,uint256)",
-  "event Approval(address indexed,address indexed,uint256)",
   "event DealSponsoredBoost(bytes32,address)",
   "event Lock(address,uint256)",
   "event OrdersMatched(bytes32,bytes32,bytes32,bytes32,bytes32,uint256)",
diff --git a/contracts/facets/IexecEscrowTokenFacet.sol b/contracts/facets/IexecEscrowTokenFacet.sol
index 3305c1f47..85338c7ff 100644
--- a/contracts/facets/IexecEscrowTokenFacet.sol
+++ b/contracts/facets/IexecEscrowTokenFacet.sol
@@ -4,7 +4,7 @@
 pragma solidity ^0.8.0;
 
 import {FacetBase} from "../abstract/FacetBase.sol";
-import {IexecEscrow} from "../abstract/IexecEscrow.sol";
+import {EscrowLib} from "../libs/EscrowLib.sol";
 import {IexecEscrowToken} from "../interfaces/IexecEscrowToken.sol";
 import {IexecTokenSpender} from "../interfaces/IexecTokenSpender.sol";
 import {IexecPoco1} from "../interfaces/IexecPoco1.sol";
@@ -24,7 +24,12 @@ import {PocoStorageLib} from "../libs/PocoStorageLib.sol";
  * escrow itself (lock, unlock, reward, seize) run over the same ledger.
  */
 // TODO rename to IexecEscrowFacet
-contract IexecEscrowTokenFacet is IexecEscrowToken, IexecTokenSpender, IexecEscrow {
+// TODO move _mint, _burn and _approve into EscrowLib. This contract inherits the
+// escrow events through IexecEscrowToken and also emits Transfer through the
+// library, so its ABI lists Transfer twice and typechain generates duplicate
+// identifiers for it. Moving the three writers into the library lets
+// IexecEscrowToken drop `is IexecEscrowEvents`, which removes the duplicate.
+contract IexecEscrowTokenFacet is IexecEscrowToken, IexecTokenSpender, FacetBase {
     /***************************************************************************
      *                     Deposit and withdraw functions                      *
      ***************************************************************************/
@@ -217,7 +222,7 @@ contract IexecEscrowTokenFacet is IexecEscrowToken, IexecTokenSpender, IexecEscr
      ***************************************************************************/
 
     function transfer(address recipient, uint256 amount) external override returns (bool) {
-        _transfer(_msgSender(), recipient, amount);
+        EscrowLib.transfer(_msgSender(), recipient, amount);
         return true;
     }
 
@@ -250,7 +255,7 @@ contract IexecEscrowTokenFacet is IexecEscrowToken, IexecTokenSpender, IexecEscr
         uint256 amount
     ) external override returns (bool) {
         PocoStorageLib.PocoStorage storage $ = PocoStorageLib.getPocoStorage();
-        _transfer(sender, recipient, amount);
+        EscrowLib.transfer(sender, recipient, amount);
         _approve(sender, _msgSender(), $.m_allowances[sender][_msgSender()] - amount);
         return true;
     }
diff --git a/contracts/facets/IexecPoco1Facet.sol b/contracts/facets/IexecPoco1Facet.sol
index 4ebcc6407..03e4d9566 100644
--- a/contracts/facets/IexecPoco1Facet.sol
+++ b/contracts/facets/IexecPoco1Facet.sol
@@ -11,7 +11,8 @@ import {IWorkerpool} from "../registries/workerpools/IWorkerpool.v8.sol";
 import {PocoStorageLib} from "../libs/PocoStorageLib.sol";
 import {IexecPoco1} from "../interfaces/IexecPoco1.sol";
 import {IexecPoco1Errors} from "../interfaces/IexecPoco1Errors.sol";
-import {IexecEscrow} from "../abstract/IexecEscrow.sol";
+import {FacetBase} from "../abstract/FacetBase.sol";
+import {EscrowLib} from "../libs/EscrowLib.sol";
 import {CommonLib} from "../libs/CommonLib.sol";
 
 struct Matching {
@@ -25,7 +26,7 @@ struct Matching {
     bool hasDataset;
 }
 
-contract IexecPoco1Facet is IexecPoco1, IexecPoco1Errors, IexecEscrow {
+contract IexecPoco1Facet is IexecPoco1, IexecPoco1Errors, FacetBase {
     using Math for uint256;
     using IexecLibOrders_v5 for IexecLibOrders_v5.AppOrder;
     using IexecLibOrders_v5 for IexecLibOrders_v5.DatasetOrder;
@@ -455,9 +456,12 @@ contract IexecPoco1Facet is IexecPoco1, IexecPoco1Errors, IexecEscrow {
         /**
          * Lock
          */
-        lock(_sponsor, (deal.app.price + deal.dataset.price + deal.workerpool.price) * volume);
+        EscrowLib.lock(
+            _sponsor,
+            (deal.app.price + deal.dataset.price + deal.workerpool.price) * volume
+        );
         //slither-disable-next-line divide-before-multiply
-        lock(
+        EscrowLib.lock(
             deal.workerpool.owner,
             ((deal.workerpool.price * WORKERPOOL_STAKE_RATIO) / 100) * volume // ORDER IS IMPORTANT HERE!
         );
diff --git a/contracts/facets/IexecPoco2Facet.sol b/contracts/facets/IexecPoco2Facet.sol
index 0eac27b57..6071f99c3 100644
--- a/contracts/facets/IexecPoco2Facet.sol
+++ b/contracts/facets/IexecPoco2Facet.sol
@@ -9,10 +9,11 @@ import {IOracleConsumer} from "../external/interfaces/IOracleConsumer.sol";
 import {IexecLibCore_v5} from "../libs/IexecLibCore_v5.sol";
 import {IexecLibOrders_v5} from "../libs/IexecLibOrders_v5.sol";
 import {IexecPoco2} from "../interfaces/IexecPoco2.sol";
-import {IexecEscrow} from "../abstract/IexecEscrow.sol";
+import {FacetBase} from "../abstract/FacetBase.sol";
+import {EscrowLib} from "../libs/EscrowLib.sol";
 import {CommonLib} from "../libs/CommonLib.sol";
 
-contract IexecPoco2Facet is IexecPoco2, IexecEscrow {
+contract IexecPoco2Facet is IexecPoco2, FacetBase {
     modifier onlyScheduler(bytes32 _taskId) {
         PocoStorageLib.PocoStorage storage $ = PocoStorageLib.getPocoStorage();
         require(_msgSender() == $.m_deals[$.m_tasks[_taskId].dealid].workerpool.owner);
@@ -30,17 +31,17 @@ contract IexecPoco2Facet is IexecPoco2, IexecEscrow {
         uint256 poolstake = (deal.workerpool.price * WORKERPOOL_STAKE_RATIO) / 100;
 
         // Seize the payer of the task
-        seize(deal.sponsor, taskPrice, _taskid);
+        EscrowLib.seize(deal.sponsor, taskPrice, _taskid);
         // dapp reward
         if (deal.app.price > 0) {
-            reward(deal.app.owner, deal.app.price, _taskid);
+            EscrowLib.reward(deal.app.owner, deal.app.price, _taskid);
         }
         // data reward
         if (deal.dataset.price > 0 && deal.dataset.pointer != address(0)) {
-            reward(deal.dataset.owner, deal.dataset.price, _taskid);
+            EscrowLib.reward(deal.dataset.owner, deal.dataset.price, _taskid);
         }
         // unlock pool stake
-        unlock(deal.workerpool.owner, poolstake);
+        EscrowLib.unlock(deal.workerpool.owner, poolstake);
         // pool reward performed by consensus manager
 
         // Retrieve part of the kitty
@@ -48,8 +49,8 @@ contract IexecPoco2Facet is IexecPoco2, IexecEscrow {
         if (kitty > 0) {
             // Get a fraction of the kitty where KITTY_MIN <= fraction <= kitty
             kitty = Math.min(Math.max((kitty * KITTY_RATIO) / 100, KITTY_MIN), kitty);
-            seize(KITTY_ADDRESS, kitty, _taskid);
-            reward(deal.workerpool.owner, kitty, _taskid);
+            EscrowLib.seize(KITTY_ADDRESS, kitty, _taskid);
+            EscrowLib.reward(deal.workerpool.owner, kitty, _taskid);
         }
     }
 
@@ -60,10 +61,10 @@ contract IexecPoco2Facet is IexecPoco2, IexecEscrow {
         uint256 taskPrice = deal.app.price + deal.dataset.price + deal.workerpool.price;
         uint256 poolstake = (deal.workerpool.price * WORKERPOOL_STAKE_RATIO) / 100;
 
-        unlock(deal.sponsor, taskPrice); // Refund the payer of the task
-        seize(deal.workerpool.owner, poolstake, _taskid);
+        EscrowLib.unlock(deal.sponsor, taskPrice); // Refund the payer of the task
+        EscrowLib.seize(deal.workerpool.owner, poolstake, _taskid);
         // Reward kitty and lock value on it.
-        rewardAndLock(KITTY_ADDRESS, poolstake, _taskid); // → Kitty / Burn
+        EscrowLib.rewardAndLock(KITTY_ADDRESS, poolstake, _taskid); // → Kitty / Burn
     }
 
     /***************************************************************************
@@ -146,7 +147,7 @@ contract IexecPoco2Facet is IexecPoco2, IexecEscrow {
         task.contributors.push(_msgSender());
 
         // Lock contribution.
-        lock(_msgSender(), deal.workerStake);
+        EscrowLib.lock(_msgSender(), deal.workerStake);
 
         emit TaskContribute(_taskid, _msgSender(), _resultHash);
 
@@ -359,7 +360,7 @@ contract IexecPoco2Facet is IexecPoco2, IexecEscrow {
         for (uint256 i = 0; i < task.contributors.length; ++i) {
             address worker = task.contributors[i];
             // Unlock contribution
-            unlock(worker, $.m_deals[task.dealid].workerStake);
+            EscrowLib.unlock(worker, $.m_deals[task.dealid].workerStake);
         }
 
         emit TaskClaimed(_taskid);
@@ -447,9 +448,9 @@ contract IexecPoco2Facet is IexecPoco2, IexecEscrow {
                 totalReward = totalReward - workerReward;
 
                 // Unlock contribution
-                unlock(worker, deal.workerStake);
+                EscrowLib.unlock(worker, deal.workerStake);
                 // Reward for contribution
-                reward(worker, workerReward, _taskid);
+                EscrowLib.reward(worker, workerReward, _taskid);
 
                 // Only reward if replication happened
                 if (task.contributors.length > 1) {
@@ -466,7 +467,7 @@ contract IexecPoco2Facet is IexecPoco2, IexecEscrow {
             else {
                 // No Reward
                 // Seize contribution
-                seize(worker, deal.workerStake, _taskid);
+                EscrowLib.seize(worker, deal.workerStake, _taskid);
 
                 // Always punish bad contributors
                 {
@@ -483,7 +484,7 @@ contract IexecPoco2Facet is IexecPoco2, IexecEscrow {
         }
         // totalReward now contains the scheduler share
         // Reward for scheduling.
-        reward(deal.workerpool.owner, totalReward, _taskid);
+        EscrowLib.reward(deal.workerpool.owner, totalReward, _taskid);
     }
 
     /*
@@ -498,9 +499,9 @@ contract IexecPoco2Facet is IexecPoco2, IexecEscrow {
         uint256 workerReward = (deal.workerpool.price * (100 - deal.schedulerRewardRatio)) / 100;
         uint256 schedulerReward = deal.workerpool.price - workerReward;
         // Reward for contribution.
-        reward(_msgSender(), workerReward, _taskid);
+        EscrowLib.reward(_msgSender(), workerReward, _taskid);
         // Reward for scheduling.
-        reward(deal.workerpool.owner, schedulerReward, _taskid);
+        EscrowLib.reward(deal.workerpool.owner, schedulerReward, _taskid);
     }
 
     /**
diff --git a/contracts/facets/IexecPocoBoostFacet.sol b/contracts/facets/IexecPocoBoostFacet.sol
index 6857a0cde..e43fa35be 100644
--- a/contracts/facets/IexecPocoBoostFacet.sol
+++ b/contracts/facets/IexecPocoBoostFacet.sol
@@ -14,7 +14,8 @@ import {IexecLibCore_v5} from "../libs/IexecLibCore_v5.sol";
 import {IexecLibOrders_v5} from "../libs/IexecLibOrders_v5.sol";
 import {IWorkerpool} from "../registries/workerpools/IWorkerpool.v8.sol";
 import {IexecPocoBoost} from "../interfaces/IexecPocoBoost.sol";
-import {IexecEscrow} from "../abstract/IexecEscrow.sol";
+import {FacetBase} from "../abstract/FacetBase.sol";
+import {EscrowLib} from "../libs/EscrowLib.sol";
 import {PocoStorageLib} from "../libs/PocoStorageLib.sol";
 import {CommonLib} from "../libs/CommonLib.sol";
 
@@ -26,7 +27,7 @@ import {CommonLib} from "../libs/CommonLib.sol";
  * @title PoCo Boost to reduce latency and increase throughput of deals.
  * @notice Works for deals with requested trust = 0.
  */
-contract IexecPocoBoostFacet is IexecPocoBoost, IexecEscrow {
+contract IexecPocoBoostFacet is IexecPocoBoost, FacetBase {
     using ECDSA for bytes32;
     using MessageHashUtils for bytes32;
     using Math for uint256;
@@ -334,12 +335,15 @@ contract IexecPocoBoostFacet is IexecPocoBoost, IexecEscrow {
         $.m_consumed[workerpoolOrderTypedDataHash] = workerpoolOrderConsumed + volume;
         $.m_consumed[requestOrderTypedDataHash] = requestOrderConsumed + volume;
         // Lock deal price from sponsor balance.
-        lock(sponsor, (appPrice + datasetPrice + workerpoolPrice) * volume);
+        EscrowLib.lock(sponsor, (appPrice + datasetPrice + workerpoolPrice) * volume);
         // Lock deal stake from scheduler balance.
         // Order is important here. First get percentage by task then
         // multiply by volume.
         //slither-disable-next-line divide-before-multiply
-        lock(workerpoolOwner, ((workerpoolPrice * WORKERPOOL_STAKE_RATIO) / 100) * volume);
+        EscrowLib.lock(
+            workerpoolOwner,
+            ((workerpoolPrice * WORKERPOOL_STAKE_RATIO) / 100) * volume
+        );
         // Notify workerpool.
         emit SchedulerNoticeBoost(
             workerpool,
@@ -440,21 +444,21 @@ contract IexecPocoBoostFacet is IexecPocoBoost, IexecEscrow {
         uint96 workerPoolPrice = deal.workerpoolPrice;
 
         // Seize requester
-        seize(deal.requester, appPrice + datasetPrice + workerPoolPrice, taskId);
+        EscrowLib.seize(deal.requester, appPrice + datasetPrice + workerPoolPrice, taskId);
         uint96 workerReward = deal.workerReward;
         // Reward worker
-        reward(msg.sender, workerReward, taskId);
+        EscrowLib.reward(msg.sender, workerReward, taskId);
         // Reward app developer
         if (appPrice > 0) {
-            reward(deal.appOwner, appPrice, taskId);
+            EscrowLib.reward(deal.appOwner, appPrice, taskId);
         }
         // Reward dataset provider
         if (datasetPrice > 0) {
-            reward(deal.datasetOwner, datasetPrice, taskId);
+            EscrowLib.reward(deal.datasetOwner, datasetPrice, taskId);
         }
 
         // Unlock scheduler stake
-        unlock(workerpoolOwner, (workerPoolPrice * WORKERPOOL_STAKE_RATIO) / 100);
+        EscrowLib.unlock(workerpoolOwner, (workerPoolPrice * WORKERPOOL_STAKE_RATIO) / 100);
         // Reward scheduler
         uint256 kitty = $.m_frozens[KITTY_ADDRESS];
         if (kitty > 0) {
@@ -463,9 +467,9 @@ contract IexecPocoBoostFacet is IexecPocoBoost, IexecEscrow {
                 // @dev As long as `KITTY_RATIO = 10`, we can introduce this small
                 kitty / KITTY_RATIO // optimization for `kitty * KITTY_RATIO / 100`
             ).min(kitty); // 3. but no more than available
-            seize(KITTY_ADDRESS, kitty, taskId);
+            EscrowLib.seize(KITTY_ADDRESS, kitty, taskId);
         }
-        reward(
+        EscrowLib.reward(
             workerpoolOwner,
             workerPoolPrice - // reward with
                 workerReward + // sheduler base reward
@@ -513,11 +517,11 @@ contract IexecPocoBoostFacet is IexecPocoBoost, IexecEscrow {
         uint96 workerPoolPrice = deal.workerpoolPrice;
         uint256 workerpoolTaskStake = (workerPoolPrice * WORKERPOOL_STAKE_RATIO) / 100;
         // Refund the payer of the task by unlocking the locked funds.
-        unlock(deal.sponsor, deal.appPrice + deal.datasetPrice + workerPoolPrice);
+        EscrowLib.unlock(deal.sponsor, deal.appPrice + deal.datasetPrice + workerPoolPrice);
         // Seize task stake from workerpool.
-        seize(deal.workerpoolOwner, workerpoolTaskStake, taskId);
+        EscrowLib.seize(deal.workerpoolOwner, workerpoolTaskStake, taskId);
         // Reward kitty and lock the rewarded amount.
-        rewardAndLock(KITTY_ADDRESS, workerpoolTaskStake, taskId);
+        EscrowLib.rewardAndLock(KITTY_ADDRESS, workerpoolTaskStake, taskId);
         emit TaskClaimed(taskId);
     }
 
diff --git a/contracts/abstract/IexecEscrow.sol b/contracts/libs/EscrowLib.sol
similarity index 77%
rename from contracts/abstract/IexecEscrow.sol
rename to contracts/libs/EscrowLib.sol
index 3a51fadaf..dfade1f9d 100644
--- a/contracts/abstract/IexecEscrow.sol
+++ b/contracts/libs/EscrowLib.sol
@@ -2,16 +2,24 @@
 // SPDX-License-Identifier: Apache-2.0
 
 pragma solidity ^0.8.0;
-import {PocoStorageLib} from "../libs/PocoStorageLib.sol";
-import {IexecEscrowEvents} from "../interfaces/IexecEscrowEvents.sol";
-import {FacetBase} from "./FacetBase.sol";
-
-// TODO convert to library
+import {PocoStorageLib} from "./PocoStorageLib.sol";
 
 /**
  * @title Manage (lock/unlock/reward/seize) user funds.
+ * @dev The events are declared here rather than taken from {IexecEscrowEvents}
+ * because solc 0.8.21 cannot compile a qualified `emit Other.Event(...)` when
+ * userdoc is requested, and docgen always requests it. A library publishes an
+ * event in the ABI of every contract that emits it along an inlined path, so
+ * {IexecEscrowEvents} stays as the single declaration feeding the aggregate
+ * interface.
  */
-abstract contract IexecEscrow is FacetBase, IexecEscrowEvents {
+library EscrowLib {
+    event Transfer(address indexed from, address indexed to, uint256 value);
+    event Reward(address owner, uint256 amount, bytes32 ref);
+    event Seize(address owner, uint256 amount, bytes32 ref);
+    event Lock(address owner, uint256 amount);
+    event Unlock(address owner, uint256 amount);
+
     /**
      * Lock some value of an account.
      * @param account The account where the value should be locked.
@@ -19,7 +27,7 @@ abstract contract IexecEscrow is FacetBase, IexecEscrowEvents {
      */
     function lock(address account, uint256 value) internal {
         PocoStorageLib.PocoStorage storage $ = PocoStorageLib.getPocoStorage();
-        _transfer(account, address(this), value);
+        transfer(account, address(this), value);
         $.m_frozens[account] += value;
         emit Lock(account, value);
     }
@@ -31,7 +39,7 @@ abstract contract IexecEscrow is FacetBase, IexecEscrowEvents {
      */
     function unlock(address account, uint256 value) internal {
         PocoStorageLib.PocoStorage storage $ = PocoStorageLib.getPocoStorage();
-        _transfer(address(this), account, value);
+        transfer(address(this), account, value);
         $.m_frozens[account] -= value;
         emit Unlock(account, value);
     }
@@ -43,7 +51,7 @@ abstract contract IexecEscrow is FacetBase, IexecEscrowEvents {
      * @param ref A reference of the reward context.
      */
     function reward(address account, uint256 value, bytes32 ref) internal {
-        _transfer(address(this), account, value);
+        transfer(address(this), account, value);
         emit Reward(account, value, ref);
     }
 
@@ -79,7 +87,7 @@ abstract contract IexecEscrow is FacetBase, IexecEscrowEvents {
      * Transfer value from a spender account to a receiver account.
      * @notice
      * This is the single implementation of an sRLC balance move. It backs both
-     * the escrow operations declared below (lock, unlock, reward) and the ERC-20
+     * the escrow operations declared above (lock, unlock, reward) and the ERC-20
      * entry points of {IexecEscrowTokenFacet}.
      * A self-transfer is a no-op on the balances and is not rejected.
      *
@@ -87,7 +95,7 @@ abstract contract IexecEscrow is FacetBase, IexecEscrowEvents {
      * @param to The address of the receiver account.
      * @param value The value to transfer.
      */
-    function _transfer(address from, address to, uint256 value) internal {
+    function transfer(address from, address to, uint256 value) internal {
         require(from != address(0), "IexecEscrow: Transfer from empty address");
         require(to != address(0), "IexecEscrow: Transfer to empty address");
         PocoStorageLib.PocoStorage storage $ = PocoStorageLib.getPocoStorage();
diff --git a/contracts/tools/testing/IexecEscrowTestContract.sol b/contracts/tools/testing/IexecEscrowTestContract.sol
index 4d20a5a34..0fe184fba 100644
--- a/contracts/tools/testing/IexecEscrowTestContract.sol
+++ b/contracts/tools/testing/IexecEscrowTestContract.sol
@@ -3,28 +3,28 @@
 
 pragma solidity ^0.8.0;
 
-import {IexecEscrow} from "../../abstract/IexecEscrow.sol";
+import {EscrowLib} from "../../libs/EscrowLib.sol";
 import {PocoStorageLib} from "../../libs/PocoStorageLib.sol";
 
 /**
  * @notice a wrapper contract to make internal functions of
- * IexecEscrow testable.
+ * EscrowLib testable.
  */
-contract IexecEscrowTestContract is IexecEscrow {
+contract IexecEscrowTestContract {
     function lock_(address account, uint256 value) external {
-        lock(account, value);
+        EscrowLib.lock(account, value);
     }
 
     function unlock_(address account, uint256 value) external {
-        unlock(account, value);
+        EscrowLib.unlock(account, value);
     }
 
     function reward_(address account, uint256 value, bytes32 ref) external {
-        reward(account, value, ref);
+        EscrowLib.reward(account, value, ref);
     }
 
     function seize_(address account, uint256 value, bytes32 ref) external {
-        seize(account, value, ref);
+        EscrowLib.seize(account, value, ref);
     }
 
     // Helper functions used in unit tests.

From d1de9fa018756acf516cb4a4091d8b95051f88c6 Mon Sep 17 00:00:00 2001
From: Zied <26070035+zguesmi@users.noreply.github.com>
Date: Tue, 1 Sep 2026 16:13:31 +0200
Subject: [PATCH 11/17] chore: clean comment

---
 contracts/facets/IexecEscrowTokenFacet.sol | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/contracts/facets/IexecEscrowTokenFacet.sol b/contracts/facets/IexecEscrowTokenFacet.sol
index 85338c7ff..b6d608ce4 100644
--- a/contracts/facets/IexecEscrowTokenFacet.sol
+++ b/contracts/facets/IexecEscrowTokenFacet.sol
@@ -24,11 +24,7 @@ import {PocoStorageLib} from "../libs/PocoStorageLib.sol";
  * escrow itself (lock, unlock, reward, seize) run over the same ledger.
  */
 // TODO rename to IexecEscrowFacet
-// TODO move _mint, _burn and _approve into EscrowLib. This contract inherits the
-// escrow events through IexecEscrowToken and also emits Transfer through the
-// library, so its ABI lists Transfer twice and typechain generates duplicate
-// identifiers for it. Moving the three writers into the library lets
-// IexecEscrowToken drop `is IexecEscrowEvents`, which removes the duplicate.
+// TODO move _mint, _burn and _approve into EscrowLib.
 contract IexecEscrowTokenFacet is IexecEscrowToken, IexecTokenSpender, FacetBase {
     /***************************************************************************
      *                     Deposit and withdraw functions                      *

From 588de351565759e36f2fdbce60e5faf666df50d7 Mon Sep 17 00:00:00 2001
From: Zied <26070035+zguesmi@users.noreply.github.com>
Date: Tue, 1 Sep 2026 16:15:48 +0200
Subject: [PATCH 12/17] docs: regenerate the solidity docs and the UML diagrams

The IexecEscrow section becomes EscrowLib and now documents the five events
the library declares. The class diagrams pick up CommonLib, EscrowLib and
the facets that reach FacetBase directly.

sol-to-uml.mjs named IexecEscrow as a base contract of the IexecEscrows
diagram; it is EscrowLib now.
---
 docs/solidity/index.md                     |   41 +-
 docs/uml/class-uml-IexecEscrows.svg        | 1202 ++++++------
 docs/uml/class-uml-IexecPocoBoostFacet.svg | 1519 ++++++++--------
 docs/uml/class-uml-IexecPocoFacets.svg     | 1921 ++++++++++----------
 docs/uml/class-uml-dir-libs.svg            | 1254 +++++++------
 scripts/tools/sol-to-uml.mjs               |    2 +-
 6 files changed, 2965 insertions(+), 2974 deletions(-)

diff --git a/docs/solidity/index.md b/docs/solidity/index.md
index 6734cf1c7..5a7936282 100644
--- a/docs/solidity/index.md
+++ b/docs/solidity/index.md
@@ -12,8 +12,6 @@ Changing the name or the path would cause a breaking change in the SDK._
 
 _Every facet must inherit from this contract._
 
-## IexecEscrow
-
 ## IexecCategoryManagerFacet
 
 ### createCategory
@@ -795,6 +793,45 @@ function broadcastWorkerpoolOrder(struct IexecLibOrders_v5.WorkerpoolOrder _work
 function broadcastRequestOrder(struct IexecLibOrders_v5.RequestOrder _requestorder) external
 ```
 
+## EscrowLib
+
+_The events are declared here rather than taken from {IexecEscrowEvents}
+because solc 0.8.21 cannot compile a qualified `emit Other.Event(...)` when
+userdoc is requested, and docgen always requests it. A library publishes an
+event in the ABI of every contract that emits it along an inlined path, so
+{IexecEscrowEvents} stays as the single declaration feeding the aggregate
+interface._
+
+### Transfer
+
+```solidity
+event Transfer(address from, address to, uint256 value)
+```
+
+### Reward
+
+```solidity
+event Reward(address owner, uint256 amount, bytes32 ref)
+```
+
+### Seize
+
+```solidity
+event Seize(address owner, uint256 amount, bytes32 ref)
+```
+
+### Lock
+
+```solidity
+event Lock(address owner, uint256 amount)
+```
+
+### Unlock
+
+```solidity
+event Unlock(address owner, uint256 amount)
+```
+
 ## IexecLibCore_v5
 
 ### Account
diff --git a/docs/uml/class-uml-IexecEscrows.svg b/docs/uml/class-uml-IexecEscrows.svg
index e96b334d3..0e3177c4d 100644
--- a/docs/uml/class-uml-IexecEscrows.svg
+++ b/docs/uml/class-uml-IexecEscrows.svg
@@ -4,60 +4,273 @@
 <!-- Generated by graphviz version 5.0.0 (20220707.1540)
  -->
 <!-- Title: UmlClassDiagram Pages: 1 -->
-<svg width="3005pt" height="2160pt"
- viewBox="0.00 0.00 3005.29 2160.20" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="2763pt" height="2160pt"
+ viewBox="0.00 0.00 2763.41 2160.20" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 2156.2)">
 <title>UmlClassDiagram</title>
-<polygon fill="white" stroke="transparent" points="-4,4 -4,-2156.2 3001.29,-2156.2 3001.29,4 -4,4"/>
+<polygon fill="white" stroke="transparent" points="-4,4 -4,-2156.2 2759.41,-2156.2 2759.41,4 -4,4"/>
 <!-- 3 -->
 <g id="node1" class="node">
 <title>3</title>
-<polygon fill="#f2f2f2" stroke="black" points="447.08,-896.1 447.08,-1205.7 756.28,-1205.7 756.28,-896.1 447.08,-896.1"/>
-<text text-anchor="middle" x="601.68" y="-1189.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Abstract&gt;&gt;</text>
-<text text-anchor="middle" x="601.68" y="-1172.3" font-family="Times,serif" font-size="14.00">FacetBase</text>
-<text text-anchor="middle" x="601.68" y="-1155.5" font-family="Times,serif" font-size="14.00">contracts/abstract/FacetBase.sol</text>
-<polyline fill="none" stroke="black" points="447.08,-1147.3 756.28,-1147.3 "/>
-<text text-anchor="start" x="455.08" y="-1130.7" font-family="Times,serif" font-size="14.00">Internal:</text>
-<text text-anchor="start" x="455.08" y="-1113.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;CONTRIBUTION_DEADLINE_RATIO: uint256</text>
-<text text-anchor="start" x="455.08" y="-1097.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;REVEAL_DEADLINE_RATIO: uint256</text>
-<text text-anchor="start" x="455.08" y="-1080.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;FINAL_DEADLINE_RATIO: uint256</text>
-<text text-anchor="start" x="455.08" y="-1063.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;WORKERPOOL_STAKE_RATIO: uint256</text>
-<text text-anchor="start" x="455.08" y="-1046.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;KITTY_RATIO: uint256</text>
-<text text-anchor="start" x="455.08" y="-1029.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;KITTY_MIN: uint256</text>
-<text text-anchor="start" x="455.08" y="-1013.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;KITTY_ADDRESS: address</text>
-<text text-anchor="start" x="455.08" y="-996.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;GROUPMEMBER_PURPOSE: uint256</text>
-<polyline fill="none" stroke="black" points="447.08,-988.1 756.28,-988.1 "/>
-<text text-anchor="start" x="455.08" y="-971.5" font-family="Times,serif" font-size="14.00">Internal:</text>
-<text text-anchor="start" x="455.08" y="-954.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;owner(): address</text>
-<text text-anchor="start" x="455.08" y="-937.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_msgSender(): address</text>
-<text text-anchor="start" x="455.08" y="-921.1" font-family="Times,serif" font-size="14.00">Public:</text>
-<text text-anchor="start" x="455.08" y="-904.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;modifier&gt;&gt; onlyOwner()</text>
-</g>
-<!-- 4 -->
+<polygon fill="#f2f2f2" stroke="black" points="19.08,-494.7 19.08,-804.3 328.28,-804.3 328.28,-494.7 19.08,-494.7"/>
+<text text-anchor="middle" x="173.68" y="-787.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Abstract&gt;&gt;</text>
+<text text-anchor="middle" x="173.68" y="-770.9" font-family="Times,serif" font-size="14.00">FacetBase</text>
+<text text-anchor="middle" x="173.68" y="-754.1" font-family="Times,serif" font-size="14.00">contracts/abstract/FacetBase.sol</text>
+<polyline fill="none" stroke="black" points="19.08,-745.9 328.28,-745.9 "/>
+<text text-anchor="start" x="27.08" y="-729.3" font-family="Times,serif" font-size="14.00">Internal:</text>
+<text text-anchor="start" x="27.08" y="-712.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;CONTRIBUTION_DEADLINE_RATIO: uint256</text>
+<text text-anchor="start" x="27.08" y="-695.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;REVEAL_DEADLINE_RATIO: uint256</text>
+<text text-anchor="start" x="27.08" y="-678.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;FINAL_DEADLINE_RATIO: uint256</text>
+<text text-anchor="start" x="27.08" y="-662.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;WORKERPOOL_STAKE_RATIO: uint256</text>
+<text text-anchor="start" x="27.08" y="-645.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;KITTY_RATIO: uint256</text>
+<text text-anchor="start" x="27.08" y="-628.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;KITTY_MIN: uint256</text>
+<text text-anchor="start" x="27.08" y="-611.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;KITTY_ADDRESS: address</text>
+<text text-anchor="start" x="27.08" y="-594.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;GROUPMEMBER_PURPOSE: uint256</text>
+<polyline fill="none" stroke="black" points="19.08,-586.7 328.28,-586.7 "/>
+<text text-anchor="start" x="27.08" y="-570.1" font-family="Times,serif" font-size="14.00">Internal:</text>
+<text text-anchor="start" x="27.08" y="-553.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;owner(): address</text>
+<text text-anchor="start" x="27.08" y="-536.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_msgSender(): address</text>
+<text text-anchor="start" x="27.08" y="-519.7" font-family="Times,serif" font-size="14.00">Public:</text>
+<text text-anchor="start" x="27.08" y="-502.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;modifier&gt;&gt; onlyOwner()</text>
+</g>
+<!-- 8 -->
 <g id="node2" class="node">
-<title>4</title>
-<polygon fill="#f2f2f2" stroke="black" points="380.21,-557.5 380.21,-741.5 765.15,-741.5 765.15,-557.5 380.21,-557.5"/>
-<text text-anchor="middle" x="572.68" y="-724.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Abstract&gt;&gt;</text>
-<text text-anchor="middle" x="572.68" y="-708.1" font-family="Times,serif" font-size="14.00">IexecEscrow</text>
-<text text-anchor="middle" x="572.68" y="-691.3" font-family="Times,serif" font-size="14.00">contracts/abstract/IexecEscrow.sol</text>
-<polyline fill="none" stroke="black" points="380.21,-683.1 765.15,-683.1 "/>
-<text text-anchor="start" x="388.21" y="-666.5" font-family="Times,serif" font-size="14.00">Internal:</text>
-<text text-anchor="start" x="388.21" y="-649.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;lock(account: address, value: uint256)</text>
-<text text-anchor="start" x="388.21" y="-632.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;unlock(account: address, value: uint256)</text>
-<text text-anchor="start" x="388.21" y="-616.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;reward(account: address, value: uint256, ref: bytes32)</text>
-<text text-anchor="start" x="388.21" y="-599.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;seize(account: address, value: uint256, ref: bytes32)</text>
-<text text-anchor="start" x="388.21" y="-582.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;rewardAndLock(account: address, value: uint256, ref: bytes32)</text>
-<text text-anchor="start" x="388.21" y="-565.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_transfer(from: address, to: address, value: uint256)</text>
-</g>
-<!-- 4&#45;&gt;3 -->
-<g id="edge1" class="edge">
-<title>4&#45;&gt;3</title>
-<path fill="none" stroke="black" d="M579.3,-741.63C581.98,-778.58 585.18,-822.65 588.31,-865.76"/>
-<polygon fill="none" stroke="black" points="577.84,-866.56 590.49,-895.72 598.79,-865.03 577.84,-866.56"/>
+<title>8</title>
+<polygon fill="#f2f2f2" stroke="black" points="679.33,-0.5 679.33,-453.3 1184.03,-453.3 1184.03,-0.5 679.33,-0.5"/>
+<text text-anchor="middle" x="931.68" y="-436.7" font-family="Times,serif" font-size="14.00">IexecEscrowTokenFacet</text>
+<text text-anchor="middle" x="931.68" y="-419.9" font-family="Times,serif" font-size="14.00">contracts/facets/IexecEscrowTokenFacet.sol</text>
+<polyline fill="none" stroke="black" points="679.33,-411.7 1184.03,-411.7 "/>
+<text text-anchor="start" x="687.33" y="-395.1" font-family="Times,serif" font-size="14.00">Internal:</text>
+<text text-anchor="start" x="687.33" y="-378.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_executeOperation(sender: address, data: bytes)</text>
+<text text-anchor="start" x="687.33" y="-361.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_validateMatchOrders(sender: address, data: bytes)</text>
+<text text-anchor="start" x="687.33" y="-344.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_deposit(from: address, amount: uint256)</text>
+<text text-anchor="start" x="687.33" y="-327.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_withdraw(to: address, amount: uint256)</text>
+<text text-anchor="start" x="687.33" y="-311.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_mint(account: address, amount: uint256)</text>
+<text text-anchor="start" x="687.33" y="-294.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_burn(account: address, amount: uint256)</text>
+<text text-anchor="start" x="687.33" y="-277.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_approve(owner: address, spender: address, amount: uint256)</text>
+<text text-anchor="start" x="687.33" y="-260.7" font-family="Times,serif" font-size="14.00">External:</text>
+<text text-anchor="start" x="687.33" y="-243.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;payable&gt;&gt; null()</text>
+<text text-anchor="start" x="687.33" y="-227.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;payable&gt;&gt; null()</text>
+<text text-anchor="start" x="687.33" y="-210.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;deposit(amount: uint256): bool</text>
+<text text-anchor="start" x="687.33" y="-193.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;depositFor(amount: uint256, target: address): bool</text>
+<text text-anchor="start" x="687.33" y="-176.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;depositForArray(amounts: uint256[], targets: address[]): bool</text>
+<text text-anchor="start" x="687.33" y="-159.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;withdraw(amount: uint256): bool</text>
+<text text-anchor="start" x="687.33" y="-143.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;withdrawTo(amount: uint256, target: address): bool</text>
+<text text-anchor="start" x="687.33" y="-126.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;recover(): uint256 &lt;&lt;onlyOwner&gt;&gt;</text>
+<text text-anchor="start" x="687.33" y="-109.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;receiveApproval(sender: address, amount: uint256, token: address, data: bytes): bool</text>
+<text text-anchor="start" x="687.33" y="-92.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;transfer(recipient: address, amount: uint256): bool</text>
+<text text-anchor="start" x="687.33" y="-75.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;approve(spender: address, value: uint256): bool</text>
+<text text-anchor="start" x="687.33" y="-59.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;approveAndCall(spender: address, value: uint256, extraData: bytes): bool</text>
+<text text-anchor="start" x="687.33" y="-42.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;transferFrom(sender: address, recipient: address, amount: uint256): bool</text>
+<text text-anchor="start" x="687.33" y="-25.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;increaseAllowance(spender: address, addedValue: uint256): bool</text>
+<text text-anchor="start" x="687.33" y="-8.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;decreaseAllowance(spender: address, subtractedValue: uint256): bool</text>
+</g>
+<!-- 8&#45;&gt;3 -->
+<g id="edge3" class="edge">
+<title>8&#45;&gt;3</title>
+<path fill="none" stroke="black" d="M679.07,-316.25C577.52,-357.06 461.04,-410.71 353.62,-479.65"/>
+<polygon fill="none" stroke="black" points="347.63,-471.02 328.33,-496.28 359.17,-488.57 347.63,-471.02"/>
 </g>
-<!-- 25 -->
+<!-- 23 -->
 <g id="node4" class="node">
-<title>25</title>
+<title>23</title>
+<polygon fill="#f2f2f2" stroke="black" points="346.71,-490.3 346.71,-808.7 642.66,-808.7 642.66,-490.3 346.71,-490.3"/>
+<text text-anchor="middle" x="494.68" y="-792.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
+<text text-anchor="middle" x="494.68" y="-775.3" font-family="Times,serif" font-size="14.00">IexecEscrowToken</text>
+<text text-anchor="middle" x="494.68" y="-758.5" font-family="Times,serif" font-size="14.00">contracts/interfaces/IexecEscrowToken.sol</text>
+<polyline fill="none" stroke="black" points="346.71,-750.3 642.66,-750.3 "/>
+<text text-anchor="start" x="354.71" y="-733.7" font-family="Times,serif" font-size="14.00">External:</text>
+<text text-anchor="start" x="354.71" y="-716.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;null()</text>
+<text text-anchor="start" x="354.71" y="-700.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;null()</text>
+<text text-anchor="start" x="354.71" y="-683.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;deposit(uint256): bool</text>
+<text text-anchor="start" x="354.71" y="-666.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;depositFor(uint256, address): bool</text>
+<text text-anchor="start" x="354.71" y="-649.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;depositForArray(uint256[], address[]): bool</text>
+<text text-anchor="start" x="354.71" y="-632.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;withdraw(uint256): bool</text>
+<text text-anchor="start" x="354.71" y="-616.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;withdrawTo(uint256, address): bool</text>
+<text text-anchor="start" x="354.71" y="-599.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;recover(): uint256</text>
+<text text-anchor="start" x="354.71" y="-582.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;transfer(address, uint256): bool</text>
+<text text-anchor="start" x="354.71" y="-565.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;approve(address, uint256): bool</text>
+<text text-anchor="start" x="354.71" y="-548.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;transferFrom(address, address, uint256): bool</text>
+<text text-anchor="start" x="354.71" y="-532.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;increaseAllowance(address, uint256): bool</text>
+<text text-anchor="start" x="354.71" y="-515.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;decreaseAllowance(address, uint256): bool</text>
+<text text-anchor="start" x="354.71" y="-498.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;approveAndCall(address, uint256, bytes): bool</text>
+</g>
+<!-- 8&#45;&gt;23 -->
+<g id="edge1" class="edge">
+<title>8&#45;&gt;23</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M694.47,-453.41C685.87,-461.67 677.33,-469.88 664.74,-482.03"/>
+<polygon fill="none" stroke="black" points="657.19,-474.73 642.91,-503.12 671.79,-489.83 657.19,-474.73"/>
+</g>
+<!-- 26 -->
+<g id="node6" class="node">
+<title>26</title>
+<polygon fill="#f2f2f2" stroke="black" points="698.19,-523.9 698.19,-775.1 1689.17,-775.1 1689.17,-523.9 698.19,-523.9"/>
+<text text-anchor="middle" x="1193.68" y="-758.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
+<text text-anchor="middle" x="1193.68" y="-741.7" font-family="Times,serif" font-size="14.00">IexecPoco1</text>
+<text text-anchor="middle" x="1193.68" y="-724.9" font-family="Times,serif" font-size="14.00">contracts/interfaces/IexecPoco1.sol</text>
+<polyline fill="none" stroke="black" points="698.19,-716.7 1689.17,-716.7 "/>
+<text text-anchor="start" x="706.19" y="-700.1" font-family="Times,serif" font-size="14.00">External:</text>
+<text text-anchor="start" x="706.19" y="-683.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;verifySignature(address, bytes32, bytes): bool</text>
+<text text-anchor="start" x="706.19" y="-666.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;verifyPresignature(address, bytes32): bool</text>
+<text text-anchor="start" x="706.19" y="-649.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;verifyPresignatureOrSignature(address, bytes32, bytes): bool</text>
+<text text-anchor="start" x="706.19" y="-632.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;assertDatasetDealCompatibility(datasetOrder: IexecLibOrders_v5.DatasetOrder, dealId: bytes32)</text>
+<text text-anchor="start" x="706.19" y="-616.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;matchOrders(IexecLibOrders_v5.AppOrder, IexecLibOrders_v5.DatasetOrder, IexecLibOrders_v5.WorkerpoolOrder, IexecLibOrders_v5.RequestOrder): bytes32</text>
+<text text-anchor="start" x="706.19" y="-599.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;sponsorMatchOrders(IexecLibOrders_v5.AppOrder, IexecLibOrders_v5.DatasetOrder, IexecLibOrders_v5.WorkerpoolOrder, IexecLibOrders_v5.RequestOrder): bytes32</text>
+<text text-anchor="start" x="706.19" y="-582.5" font-family="Times,serif" font-size="14.00">Public:</text>
+<text text-anchor="start" x="706.19" y="-565.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; SchedulerNotice(workerpool: address, dealid: bytes32)</text>
+<text text-anchor="start" x="706.19" y="-548.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; OrdersMatched(dealid: bytes32, appHash: bytes32, datasetHash: bytes32, workerpoolHash: bytes32, requestHash: bytes32, volume: uint256)</text>
+<text text-anchor="start" x="706.19" y="-532.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; DealSponsored(dealId: bytes32, sponsor: address)</text>
+</g>
+<!-- 8&#45;&gt;26 -->
+<g id="edge6" class="edge">
+<title>8&#45;&gt;26</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1072.27,-453.59C1085.33,-474.56 1098.26,-495.32 1110.54,-515.03"/>
+<polygon fill="black" stroke="black" points="1107.69,-517.07 1115.95,-523.71 1113.63,-513.37 1107.69,-517.07"/>
+</g>
+<!-- 33 -->
+<g id="node7" class="node">
+<title>33</title>
+<polygon fill="#f2f2f2" stroke="black" points="1706.84,-599.5 1706.84,-699.5 2052.53,-699.5 2052.53,-599.5 1706.84,-599.5"/>
+<text text-anchor="middle" x="1879.68" y="-682.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
+<text text-anchor="middle" x="1879.68" y="-666.1" font-family="Times,serif" font-size="14.00">IexecTokenSpender</text>
+<text text-anchor="middle" x="1879.68" y="-649.3" font-family="Times,serif" font-size="14.00">contracts/interfaces/IexecTokenSpender.sol</text>
+<polyline fill="none" stroke="black" points="1706.84,-641.1 2052.53,-641.1 "/>
+<text text-anchor="start" x="1714.84" y="-624.5" font-family="Times,serif" font-size="14.00">External:</text>
+<text text-anchor="start" x="1714.84" y="-607.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;receiveApproval(address, uint256, address, bytes): bool</text>
+</g>
+<!-- 8&#45;&gt;33 -->
+<g id="edge2" class="edge">
+<title>8&#45;&gt;33</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1184.07,-287.58C1338.73,-330.48 1537.14,-397.18 1697.68,-489.8 1739.03,-513.65 1779.6,-547.68 1811.91,-578.12"/>
+<polygon fill="none" stroke="black" points="1805.03,-586.07 1833.86,-599.45 1819.66,-571.01 1805.03,-586.07"/>
+</g>
+<!-- 35 -->
+<g id="node8" class="node">
+<title>35</title>
+<polygon fill="#f2f2f2" stroke="black" points="2109.05,-507.1 2109.05,-791.9 2514.31,-791.9 2514.31,-507.1 2109.05,-507.1"/>
+<text text-anchor="middle" x="2311.68" y="-775.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
+<text text-anchor="middle" x="2311.68" y="-758.5" font-family="Times,serif" font-size="14.00">EscrowLib</text>
+<text text-anchor="middle" x="2311.68" y="-741.7" font-family="Times,serif" font-size="14.00">contracts/libs/EscrowLib.sol</text>
+<polyline fill="none" stroke="black" points="2109.05,-733.5 2514.31,-733.5 "/>
+<text text-anchor="start" x="2117.05" y="-716.9" font-family="Times,serif" font-size="14.00">Internal:</text>
+<text text-anchor="start" x="2117.05" y="-700.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;lock(account: address, value: uint256)</text>
+<text text-anchor="start" x="2117.05" y="-683.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;unlock(account: address, value: uint256)</text>
+<text text-anchor="start" x="2117.05" y="-666.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;reward(account: address, value: uint256, ref: bytes32)</text>
+<text text-anchor="start" x="2117.05" y="-649.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;seize(account: address, value: uint256, ref: bytes32)</text>
+<text text-anchor="start" x="2117.05" y="-632.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;rewardAndLock(account: address, value: uint256, ref: bytes32)</text>
+<text text-anchor="start" x="2117.05" y="-616.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;transfer(from: address, to: address, value: uint256)</text>
+<text text-anchor="start" x="2117.05" y="-599.3" font-family="Times,serif" font-size="14.00">Public:</text>
+<text text-anchor="start" x="2117.05" y="-582.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Transfer(from: address, to: address, value: uint256)</text>
+<text text-anchor="start" x="2117.05" y="-565.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Reward(owner: address, amount: uint256, ref: bytes32)</text>
+<text text-anchor="start" x="2117.05" y="-548.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Seize(owner: address, amount: uint256, ref: bytes32)</text>
+<text text-anchor="start" x="2117.05" y="-532.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Lock(owner: address, amount: uint256)</text>
+<text text-anchor="start" x="2117.05" y="-515.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Unlock(owner: address, amount: uint256)</text>
+</g>
+<!-- 8&#45;&gt;35 -->
+<g id="edge8" class="edge">
+<title>8&#45;&gt;35</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1184.19,-254.53C1426.39,-286.96 1798.02,-355.01 2094.68,-489.8 2103.03,-493.59 2111.37,-497.74 2119.67,-502.16"/>
+<polygon fill="black" stroke="black" points="2118.19,-505.34 2128.64,-507.06 2121.54,-499.2 2118.19,-505.34"/>
+</g>
+<!-- 50 -->
+<g id="node10" class="node">
+<title>50</title>
+<polygon fill="#f2f2f2" stroke="black" points="976.92,-845.7 976.92,-1256.1 1410.45,-1256.1 1410.45,-845.7 976.92,-845.7"/>
+<text text-anchor="middle" x="1193.68" y="-1239.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
+<text text-anchor="middle" x="1193.68" y="-1222.7" font-family="Times,serif" font-size="14.00">IexecLibOrders_v5</text>
+<text text-anchor="middle" x="1193.68" y="-1205.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="976.92,-1197.7 1410.45,-1197.7 "/>
+<text text-anchor="start" x="984.92" y="-1181.1" font-family="Times,serif" font-size="14.00">Public:</text>
+<text text-anchor="start" x="984.92" y="-1164.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;EIP712DOMAIN_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="984.92" y="-1147.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;APPORDER_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="984.92" y="-1130.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;DATASETORDER_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="984.92" y="-1113.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;WORKERPOOLORDER_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="984.92" y="-1097.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;REQUESTORDER_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="984.92" y="-1080.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;APPORDEROPERATION_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="984.92" y="-1063.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;DATASETORDEROPERATION_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="984.92" y="-1046.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;WORKERPOOLORDEROPERATION_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="984.92" y="-1029.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;REQUESTORDEROPERATION_TYPEHASH: bytes32</text>
+<polyline fill="none" stroke="black" points="976.92,-1021.7 1410.45,-1021.7 "/>
+<text text-anchor="start" x="984.92" y="-1005.1" font-family="Times,serif" font-size="14.00">Public:</text>
+<text text-anchor="start" x="984.92" y="-988.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_domain: EIP712Domain): (domainhash: bytes32)</text>
+<text text-anchor="start" x="984.92" y="-971.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_apporder: AppOrder): (apphash: bytes32)</text>
+<text text-anchor="start" x="984.92" y="-954.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_datasetorder: DatasetOrder): (datasethash: bytes32)</text>
+<text text-anchor="start" x="984.92" y="-937.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_workerpoolorder: WorkerpoolOrder): (workerpoolhash: bytes32)</text>
+<text text-anchor="start" x="984.92" y="-921.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_requestorder: RequestOrder): (requesthash: bytes32)</text>
+<text text-anchor="start" x="984.92" y="-904.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_apporderoperation: AppOrderOperation): bytes32</text>
+<text text-anchor="start" x="984.92" y="-887.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_datasetorderoperation: DatasetOrderOperation): bytes32</text>
+<text text-anchor="start" x="984.92" y="-870.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_workerpoolorderoperation: WorkerpoolOrderOperation): bytes32</text>
+<text text-anchor="start" x="984.92" y="-853.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_requestorderoperation: RequestOrderOperation): bytes32</text>
+</g>
+<!-- 8&#45;&gt;50 -->
+<g id="edge7" class="edge">
+<title>8&#45;&gt;50</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M706.72,-453.37C700.27,-465.24 694.53,-477.4 689.68,-489.8 663.82,-555.9 651.82,-749.16 689.68,-809.2 751.06,-906.53 863.84,-965.35 967.17,-1000.44"/>
+<polygon fill="black" stroke="black" points="966.22,-1003.82 976.82,-1003.66 968.44,-997.18 966.22,-1003.82"/>
+</g>
+<!-- 61 -->
+<g id="node21" class="node">
+<title>61</title>
+<polygon fill="#f2f2f2" stroke="black" points="2269.24,-980.1 2269.24,-1121.7 2534.13,-1121.7 2534.13,-980.1 2269.24,-980.1"/>
+<text text-anchor="middle" x="2401.68" y="-1105.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
+<text text-anchor="middle" x="2401.68" y="-1088.3" font-family="Times,serif" font-size="14.00">PocoStorageLib</text>
+<text text-anchor="middle" x="2401.68" y="-1071.5" font-family="Times,serif" font-size="14.00">contracts/libs/PocoStorageLib.sol</text>
+<polyline fill="none" stroke="black" points="2269.24,-1063.3 2534.13,-1063.3 "/>
+<text text-anchor="start" x="2277.24" y="-1046.7" font-family="Times,serif" font-size="14.00">Private:</text>
+<text text-anchor="start" x="2277.24" y="-1029.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;POCO_STORAGE_LOCATION: bytes32</text>
+<polyline fill="none" stroke="black" points="2269.24,-1021.7 2534.13,-1021.7 "/>
+<text text-anchor="start" x="2277.24" y="-1005.1" font-family="Times,serif" font-size="14.00">Internal:</text>
+<text text-anchor="start" x="2277.24" y="-988.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;getPocoStorage(): ($: PocoStorage)</text>
+</g>
+<!-- 8&#45;&gt;61 -->
+<g id="edge4" class="edge">
+<title>8&#45;&gt;61</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1184.23,-231.35C1589.02,-242.81 2354.87,-290.95 2523.68,-489.8 2640.87,-627.84 2529.85,-852.59 2455.82,-971.06"/>
+<polygon fill="black" stroke="black" points="2452.71,-969.43 2450.33,-979.76 2458.63,-973.17 2452.71,-969.43"/>
+</g>
+<!-- 62 -->
+<g id="node22" class="node">
+<title>62</title>
+<polygon fill="#f2f2f2" stroke="black" points="2140.71,-1293.1 2140.71,-1779.5 2662.65,-1779.5 2662.65,-1293.1 2140.71,-1293.1"/>
+<text text-anchor="middle" x="2401.68" y="-1762.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="2401.68" y="-1746.1" font-family="Times,serif" font-size="14.00">PocoStorage</text>
+<text text-anchor="middle" x="2401.68" y="-1729.3" font-family="Times,serif" font-size="14.00">contracts/libs/PocoStorageLib.sol</text>
+<polyline fill="none" stroke="black" points="2140.71,-1721.1 2662.65,-1721.1 "/>
+<text text-anchor="start" x="2148.71" y="-1704.5" font-family="Times,serif" font-size="14.00">m_appregistry: IRegistry</text>
+<text text-anchor="start" x="2148.71" y="-1687.7" font-family="Times,serif" font-size="14.00">m_datasetregistry: IRegistry</text>
+<text text-anchor="start" x="2148.71" y="-1670.9" font-family="Times,serif" font-size="14.00">m_workerpoolregistry: IRegistry</text>
+<text text-anchor="start" x="2148.71" y="-1654.1" font-family="Times,serif" font-size="14.00">m_baseToken: IERC20</text>
+<text text-anchor="start" x="2148.71" y="-1637.3" font-family="Times,serif" font-size="14.00">m_name: string</text>
+<text text-anchor="start" x="2148.71" y="-1620.5" font-family="Times,serif" font-size="14.00">m_symbol: string</text>
+<text text-anchor="start" x="2148.71" y="-1603.7" font-family="Times,serif" font-size="14.00">m_decimals: uint8</text>
+<text text-anchor="start" x="2148.71" y="-1586.9" font-family="Times,serif" font-size="14.00">m_totalSupply: uint256</text>
+<text text-anchor="start" x="2148.71" y="-1570.1" font-family="Times,serif" font-size="14.00">m_balances: mapping(address=&gt;uint256)</text>
+<text text-anchor="start" x="2148.71" y="-1553.3" font-family="Times,serif" font-size="14.00">m_frozens: mapping(address=&gt;uint256)</text>
+<text text-anchor="start" x="2148.71" y="-1536.5" font-family="Times,serif" font-size="14.00">m_allowances: mapping(address=&gt;mapping(address=&gt;uint256))</text>
+<text text-anchor="start" x="2148.71" y="-1519.7" font-family="Times,serif" font-size="14.00">m_eip712DomainSeparator: bytes32</text>
+<text text-anchor="start" x="2148.71" y="-1502.9" font-family="Times,serif" font-size="14.00">m_presigned: mapping(bytes32=&gt;address)</text>
+<text text-anchor="start" x="2148.71" y="-1486.1" font-family="Times,serif" font-size="14.00">m_consumed: mapping(bytes32=&gt;uint256)</text>
+<text text-anchor="start" x="2148.71" y="-1469.3" font-family="Times,serif" font-size="14.00">m_deals: mapping(bytes32=&gt;IexecLibCore_v5.Deal)</text>
+<text text-anchor="start" x="2148.71" y="-1452.5" font-family="Times,serif" font-size="14.00">m_tasks: mapping(bytes32=&gt;IexecLibCore_v5.Task)</text>
+<text text-anchor="start" x="2148.71" y="-1435.7" font-family="Times,serif" font-size="14.00">m_consensus: mapping(bytes32=&gt;IexecLibCore_v5.Consensus)</text>
+<text text-anchor="start" x="2148.71" y="-1418.9" font-family="Times,serif" font-size="14.00">m_contributions: mapping(bytes32=&gt;mapping(address=&gt;IexecLibCore_v5.Contribution))</text>
+<text text-anchor="start" x="2148.71" y="-1402.1" font-family="Times,serif" font-size="14.00">m_workerScores: mapping(address=&gt;uint256)</text>
+<text text-anchor="start" x="2148.71" y="-1385.3" font-family="Times,serif" font-size="14.00">m_teebroker: address</text>
+<text text-anchor="start" x="2148.71" y="-1368.5" font-family="Times,serif" font-size="14.00">m_callbackgas: uint256</text>
+<text text-anchor="start" x="2148.71" y="-1351.7" font-family="Times,serif" font-size="14.00">m_categories: IexecLibCore_v5.Category[]</text>
+<text text-anchor="start" x="2148.71" y="-1334.9" font-family="Times,serif" font-size="14.00">m_v3_iexecHub: IexecHubV3Interface</text>
+<text text-anchor="start" x="2148.71" y="-1318.1" font-family="Times,serif" font-size="14.00">m_v3_scoreImported: mapping(address=&gt;bool)</text>
+<text text-anchor="start" x="2148.71" y="-1301.3" font-family="Times,serif" font-size="14.00">m_dealsBoost: mapping(bytes32=&gt;IexecLibCore_v5.DealBoost)</text>
+</g>
+<!-- 8&#45;&gt;62 -->
+<g id="edge5" class="edge">
+<title>8&#45;&gt;62</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1184.35,-252.9C1480.84,-287.74 1946.72,-361.53 2061.68,-489.8 2109.39,-543.03 2085.29,-739.18 2099.68,-809.2 2141.41,-1012.28 2147.65,-1067.07 2231.68,-1256.6 2235.69,-1265.63 2239.94,-1274.73 2244.38,-1283.84"/>
+<polygon fill="black" stroke="black" points="2241.31,-1285.54 2248.88,-1292.95 2247.59,-1282.44 2241.31,-1285.54"/>
+</g>
+<!-- 22 -->
+<g id="node3" class="node">
+<title>22</title>
 <polygon fill="#f2f2f2" stroke="black" points="0,-958.9 0,-1142.9 429.36,-1142.9 429.36,-958.9 0,-958.9"/>
 <text text-anchor="middle" x="214.68" y="-1126.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
 <text text-anchor="middle" x="214.68" y="-1109.5" font-family="Times,serif" font-size="14.00">IexecEscrowEvents</text>
@@ -71,641 +284,428 @@
 <text text-anchor="start" x="8" y="-983.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Lock(owner: address, amount: uint256)</text>
 <text text-anchor="start" x="8" y="-967.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Unlock(owner: address, amount: uint256)</text>
 </g>
-<!-- 4&#45;&gt;25 -->
-<g id="edge2" class="edge">
-<title>4&#45;&gt;25</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M491,-741.63C439.19,-799.43 371.75,-874.66 316.47,-936.34"/>
-<polygon fill="none" stroke="black" points="308.53,-929.47 296.32,-958.82 324.17,-943.49 308.53,-929.47"/>
-</g>
-<!-- 62 -->
-<g id="node21" class="node">
-<title>62</title>
-<polygon fill="#f2f2f2" stroke="black" points="812.24,-980.1 812.24,-1121.7 1077.13,-1121.7 1077.13,-980.1 812.24,-980.1"/>
-<text text-anchor="middle" x="944.68" y="-1105.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
-<text text-anchor="middle" x="944.68" y="-1088.3" font-family="Times,serif" font-size="14.00">PocoStorageLib</text>
-<text text-anchor="middle" x="944.68" y="-1071.5" font-family="Times,serif" font-size="14.00">contracts/libs/PocoStorageLib.sol</text>
-<polyline fill="none" stroke="black" points="812.24,-1063.3 1077.13,-1063.3 "/>
-<text text-anchor="start" x="820.24" y="-1046.7" font-family="Times,serif" font-size="14.00">Private:</text>
-<text text-anchor="start" x="820.24" y="-1029.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;POCO_STORAGE_LOCATION: bytes32</text>
-<polyline fill="none" stroke="black" points="812.24,-1021.7 1077.13,-1021.7 "/>
-<text text-anchor="start" x="820.24" y="-1005.1" font-family="Times,serif" font-size="14.00">Internal:</text>
-<text text-anchor="start" x="820.24" y="-988.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;getPocoStorage(): ($: PocoStorage)</text>
-</g>
-<!-- 4&#45;&gt;62 -->
-<g id="edge3" class="edge">
-<title>4&#45;&gt;62</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M689.07,-741.54C725.85,-772.67 765.52,-808.86 798.68,-845.2 834.1,-884.02 868.5,-931.6 895,-971.12"/>
-<polygon fill="black" stroke="black" points="892.42,-973.56 900.87,-979.94 898.24,-969.68 892.42,-973.56"/>
-</g>
-<!-- 63 -->
-<g id="node22" class="node">
-<title>63</title>
-<polygon fill="#f2f2f2" stroke="black" points="683.71,-1293.1 683.71,-1779.5 1205.65,-1779.5 1205.65,-1293.1 683.71,-1293.1"/>
-<text text-anchor="middle" x="944.68" y="-1762.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="944.68" y="-1746.1" font-family="Times,serif" font-size="14.00">PocoStorage</text>
-<text text-anchor="middle" x="944.68" y="-1729.3" font-family="Times,serif" font-size="14.00">contracts/libs/PocoStorageLib.sol</text>
-<polyline fill="none" stroke="black" points="683.71,-1721.1 1205.65,-1721.1 "/>
-<text text-anchor="start" x="691.71" y="-1704.5" font-family="Times,serif" font-size="14.00">m_appregistry: IRegistry</text>
-<text text-anchor="start" x="691.71" y="-1687.7" font-family="Times,serif" font-size="14.00">m_datasetregistry: IRegistry</text>
-<text text-anchor="start" x="691.71" y="-1670.9" font-family="Times,serif" font-size="14.00">m_workerpoolregistry: IRegistry</text>
-<text text-anchor="start" x="691.71" y="-1654.1" font-family="Times,serif" font-size="14.00">m_baseToken: IERC20</text>
-<text text-anchor="start" x="691.71" y="-1637.3" font-family="Times,serif" font-size="14.00">m_name: string</text>
-<text text-anchor="start" x="691.71" y="-1620.5" font-family="Times,serif" font-size="14.00">m_symbol: string</text>
-<text text-anchor="start" x="691.71" y="-1603.7" font-family="Times,serif" font-size="14.00">m_decimals: uint8</text>
-<text text-anchor="start" x="691.71" y="-1586.9" font-family="Times,serif" font-size="14.00">m_totalSupply: uint256</text>
-<text text-anchor="start" x="691.71" y="-1570.1" font-family="Times,serif" font-size="14.00">m_balances: mapping(address=&gt;uint256)</text>
-<text text-anchor="start" x="691.71" y="-1553.3" font-family="Times,serif" font-size="14.00">m_frozens: mapping(address=&gt;uint256)</text>
-<text text-anchor="start" x="691.71" y="-1536.5" font-family="Times,serif" font-size="14.00">m_allowances: mapping(address=&gt;mapping(address=&gt;uint256))</text>
-<text text-anchor="start" x="691.71" y="-1519.7" font-family="Times,serif" font-size="14.00">m_eip712DomainSeparator: bytes32</text>
-<text text-anchor="start" x="691.71" y="-1502.9" font-family="Times,serif" font-size="14.00">m_presigned: mapping(bytes32=&gt;address)</text>
-<text text-anchor="start" x="691.71" y="-1486.1" font-family="Times,serif" font-size="14.00">m_consumed: mapping(bytes32=&gt;uint256)</text>
-<text text-anchor="start" x="691.71" y="-1469.3" font-family="Times,serif" font-size="14.00">m_deals: mapping(bytes32=&gt;IexecLibCore_v5.Deal)</text>
-<text text-anchor="start" x="691.71" y="-1452.5" font-family="Times,serif" font-size="14.00">m_tasks: mapping(bytes32=&gt;IexecLibCore_v5.Task)</text>
-<text text-anchor="start" x="691.71" y="-1435.7" font-family="Times,serif" font-size="14.00">m_consensus: mapping(bytes32=&gt;IexecLibCore_v5.Consensus)</text>
-<text text-anchor="start" x="691.71" y="-1418.9" font-family="Times,serif" font-size="14.00">m_contributions: mapping(bytes32=&gt;mapping(address=&gt;IexecLibCore_v5.Contribution))</text>
-<text text-anchor="start" x="691.71" y="-1402.1" font-family="Times,serif" font-size="14.00">m_workerScores: mapping(address=&gt;uint256)</text>
-<text text-anchor="start" x="691.71" y="-1385.3" font-family="Times,serif" font-size="14.00">m_teebroker: address</text>
-<text text-anchor="start" x="691.71" y="-1368.5" font-family="Times,serif" font-size="14.00">m_callbackgas: uint256</text>
-<text text-anchor="start" x="691.71" y="-1351.7" font-family="Times,serif" font-size="14.00">m_categories: IexecLibCore_v5.Category[]</text>
-<text text-anchor="start" x="691.71" y="-1334.9" font-family="Times,serif" font-size="14.00">m_v3_iexecHub: IexecHubV3Interface</text>
-<text text-anchor="start" x="691.71" y="-1318.1" font-family="Times,serif" font-size="14.00">m_v3_scoreImported: mapping(address=&gt;bool)</text>
-<text text-anchor="start" x="691.71" y="-1301.3" font-family="Times,serif" font-size="14.00">m_dealsBoost: mapping(bytes32=&gt;IexecLibCore_v5.DealBoost)</text>
-</g>
-<!-- 4&#45;&gt;63 -->
-<g id="edge4" class="edge">
-<title>4&#45;&gt;63</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M688.8,-741.71C718.82,-771.39 747.72,-806.71 765.68,-845.2 843.32,-1011.6 752.89,-1080.14 803.68,-1256.6 806.21,-1265.4 809.03,-1274.26 812.07,-1283.12"/>
-<polygon fill="black" stroke="black" points="808.84,-1284.46 815.46,-1292.73 815.44,-1282.14 808.84,-1284.46"/>
-</g>
-<!-- 11 -->
-<g id="node3" class="node">
-<title>11</title>
-<polygon fill="#f2f2f2" stroke="black" points="540.33,-0.5 540.33,-453.3 1045.03,-453.3 1045.03,-0.5 540.33,-0.5"/>
-<text text-anchor="middle" x="792.68" y="-436.7" font-family="Times,serif" font-size="14.00">IexecEscrowTokenFacet</text>
-<text text-anchor="middle" x="792.68" y="-419.9" font-family="Times,serif" font-size="14.00">contracts/facets/IexecEscrowTokenFacet.sol</text>
-<polyline fill="none" stroke="black" points="540.33,-411.7 1045.03,-411.7 "/>
-<text text-anchor="start" x="548.33" y="-395.1" font-family="Times,serif" font-size="14.00">Internal:</text>
-<text text-anchor="start" x="548.33" y="-378.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_executeOperation(sender: address, data: bytes)</text>
-<text text-anchor="start" x="548.33" y="-361.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_validateMatchOrders(sender: address, data: bytes)</text>
-<text text-anchor="start" x="548.33" y="-344.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_deposit(from: address, amount: uint256)</text>
-<text text-anchor="start" x="548.33" y="-327.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_withdraw(to: address, amount: uint256)</text>
-<text text-anchor="start" x="548.33" y="-311.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_mint(account: address, amount: uint256)</text>
-<text text-anchor="start" x="548.33" y="-294.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_burn(account: address, amount: uint256)</text>
-<text text-anchor="start" x="548.33" y="-277.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_approve(owner: address, spender: address, amount: uint256)</text>
-<text text-anchor="start" x="548.33" y="-260.7" font-family="Times,serif" font-size="14.00">External:</text>
-<text text-anchor="start" x="548.33" y="-243.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;payable&gt;&gt; null()</text>
-<text text-anchor="start" x="548.33" y="-227.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;payable&gt;&gt; null()</text>
-<text text-anchor="start" x="548.33" y="-210.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;deposit(amount: uint256): bool</text>
-<text text-anchor="start" x="548.33" y="-193.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;depositFor(amount: uint256, target: address): bool</text>
-<text text-anchor="start" x="548.33" y="-176.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;depositForArray(amounts: uint256[], targets: address[]): bool</text>
-<text text-anchor="start" x="548.33" y="-159.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;withdraw(amount: uint256): bool</text>
-<text text-anchor="start" x="548.33" y="-143.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;withdrawTo(amount: uint256, target: address): bool</text>
-<text text-anchor="start" x="548.33" y="-126.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;recover(): uint256 &lt;&lt;onlyOwner&gt;&gt;</text>
-<text text-anchor="start" x="548.33" y="-109.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;receiveApproval(sender: address, amount: uint256, token: address, data: bytes): bool</text>
-<text text-anchor="start" x="548.33" y="-92.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;transfer(recipient: address, amount: uint256): bool</text>
-<text text-anchor="start" x="548.33" y="-75.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;approve(spender: address, value: uint256): bool</text>
-<text text-anchor="start" x="548.33" y="-59.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;approveAndCall(spender: address, value: uint256, extraData: bytes): bool</text>
-<text text-anchor="start" x="548.33" y="-42.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;transferFrom(sender: address, recipient: address, amount: uint256): bool</text>
-<text text-anchor="start" x="548.33" y="-25.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;increaseAllowance(spender: address, addedValue: uint256): bool</text>
-<text text-anchor="start" x="548.33" y="-8.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;decreaseAllowance(spender: address, subtractedValue: uint256): bool</text>
-</g>
-<!-- 11&#45;&gt;4 -->
-<g id="edge7" class="edge">
-<title>11&#45;&gt;4</title>
-<path fill="none" stroke="black" d="M674.63,-453.59C660.78,-480.07 647.1,-506.22 634.48,-530.35"/>
-<polygon fill="none" stroke="black" points="625.07,-525.69 620.47,-557.14 643.68,-535.43 625.07,-525.69"/>
+<!-- 23&#45;&gt;22 -->
+<g id="edge9" class="edge">
+<title>23&#45;&gt;22</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M383.62,-808.93C354.37,-850.64 323.36,-894.87 296.01,-933.9"/>
+<polygon fill="none" stroke="black" points="287.23,-928.12 278.61,-958.71 304.43,-940.17 287.23,-928.12"/>
 </g>
-<!-- 26 -->
+<!-- 24 -->
 <g id="node5" class="node">
-<title>26</title>
-<polygon fill="#f2f2f2" stroke="black" points="66.71,-490.3 66.71,-808.7 362.66,-808.7 362.66,-490.3 66.71,-490.3"/>
-<text text-anchor="middle" x="214.68" y="-792.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
-<text text-anchor="middle" x="214.68" y="-775.3" font-family="Times,serif" font-size="14.00">IexecEscrowToken</text>
-<text text-anchor="middle" x="214.68" y="-758.5" font-family="Times,serif" font-size="14.00">contracts/interfaces/IexecEscrowToken.sol</text>
-<polyline fill="none" stroke="black" points="66.71,-750.3 362.66,-750.3 "/>
-<text text-anchor="start" x="74.71" y="-733.7" font-family="Times,serif" font-size="14.00">External:</text>
-<text text-anchor="start" x="74.71" y="-716.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;null()</text>
-<text text-anchor="start" x="74.71" y="-700.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;null()</text>
-<text text-anchor="start" x="74.71" y="-683.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;deposit(uint256): bool</text>
-<text text-anchor="start" x="74.71" y="-666.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;depositFor(uint256, address): bool</text>
-<text text-anchor="start" x="74.71" y="-649.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;depositForArray(uint256[], address[]): bool</text>
-<text text-anchor="start" x="74.71" y="-632.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;withdraw(uint256): bool</text>
-<text text-anchor="start" x="74.71" y="-616.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;withdrawTo(uint256, address): bool</text>
-<text text-anchor="start" x="74.71" y="-599.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;recover(): uint256</text>
-<text text-anchor="start" x="74.71" y="-582.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;transfer(address, uint256): bool</text>
-<text text-anchor="start" x="74.71" y="-565.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;approve(address, uint256): bool</text>
-<text text-anchor="start" x="74.71" y="-548.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;transferFrom(address, address, uint256): bool</text>
-<text text-anchor="start" x="74.71" y="-532.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;increaseAllowance(address, uint256): bool</text>
-<text text-anchor="start" x="74.71" y="-515.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;decreaseAllowance(address, uint256): bool</text>
-<text text-anchor="start" x="74.71" y="-498.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;approveAndCall(address, uint256, bytes): bool</text>
-</g>
-<!-- 11&#45;&gt;26 -->
-<g id="edge5" class="edge">
-<title>11&#45;&gt;26</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M540.12,-371.62C490.45,-403.03 439.27,-437.68 386.82,-478.14"/>
-<polygon fill="none" stroke="black" points="380.14,-470.04 363.04,-496.83 393.12,-486.55 380.14,-470.04"/>
-</g>
-<!-- 29 -->
-<g id="node7" class="node">
-<title>29</title>
-<polygon fill="#f2f2f2" stroke="black" points="1222.19,-523.9 1222.19,-775.1 2213.17,-775.1 2213.17,-523.9 1222.19,-523.9"/>
-<text text-anchor="middle" x="1717.68" y="-758.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
-<text text-anchor="middle" x="1717.68" y="-741.7" font-family="Times,serif" font-size="14.00">IexecPoco1</text>
-<text text-anchor="middle" x="1717.68" y="-724.9" font-family="Times,serif" font-size="14.00">contracts/interfaces/IexecPoco1.sol</text>
-<polyline fill="none" stroke="black" points="1222.19,-716.7 2213.17,-716.7 "/>
-<text text-anchor="start" x="1230.19" y="-700.1" font-family="Times,serif" font-size="14.00">External:</text>
-<text text-anchor="start" x="1230.19" y="-683.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;verifySignature(address, bytes32, bytes): bool</text>
-<text text-anchor="start" x="1230.19" y="-666.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;verifyPresignature(address, bytes32): bool</text>
-<text text-anchor="start" x="1230.19" y="-649.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;verifyPresignatureOrSignature(address, bytes32, bytes): bool</text>
-<text text-anchor="start" x="1230.19" y="-632.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;assertDatasetDealCompatibility(datasetOrder: IexecLibOrders_v5.DatasetOrder, dealId: bytes32)</text>
-<text text-anchor="start" x="1230.19" y="-616.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;matchOrders(IexecLibOrders_v5.AppOrder, IexecLibOrders_v5.DatasetOrder, IexecLibOrders_v5.WorkerpoolOrder, IexecLibOrders_v5.RequestOrder): bytes32</text>
-<text text-anchor="start" x="1230.19" y="-599.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;sponsorMatchOrders(IexecLibOrders_v5.AppOrder, IexecLibOrders_v5.DatasetOrder, IexecLibOrders_v5.WorkerpoolOrder, IexecLibOrders_v5.RequestOrder): bytes32</text>
-<text text-anchor="start" x="1230.19" y="-582.5" font-family="Times,serif" font-size="14.00">Public:</text>
-<text text-anchor="start" x="1230.19" y="-565.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; SchedulerNotice(workerpool: address, dealid: bytes32)</text>
-<text text-anchor="start" x="1230.19" y="-548.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; OrdersMatched(dealid: bytes32, appHash: bytes32, datasetHash: bytes32, workerpoolHash: bytes32, requestHash: bytes32, volume: uint256)</text>
-<text text-anchor="start" x="1230.19" y="-532.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; DealSponsored(dealId: bytes32, sponsor: address)</text>
-</g>
-<!-- 11&#45;&gt;29 -->
+<title>24</title>
+<polygon fill="#f2f2f2" stroke="black" points="2007.78,-1934.1 2007.78,-2034.1 2277.59,-2034.1 2277.59,-1934.1 2007.78,-1934.1"/>
+<text text-anchor="middle" x="2142.68" y="-2017.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
+<text text-anchor="middle" x="2142.68" y="-2000.7" font-family="Times,serif" font-size="14.00">IexecHubV3Interface</text>
+<text text-anchor="middle" x="2142.68" y="-1983.9" font-family="Times,serif" font-size="14.00">contracts/interfaces/IexecHubV3Interface.sol</text>
+<polyline fill="none" stroke="black" points="2007.78,-1975.7 2277.59,-1975.7 "/>
+<text text-anchor="start" x="2015.78" y="-1959.1" font-family="Times,serif" font-size="14.00">External:</text>
+<text text-anchor="start" x="2015.78" y="-1942.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;viewScore(worker: address): uint256</text>
+</g>
+<!-- 26&#45;&gt;50 -->
 <g id="edge10" class="edge">
-<title>11&#45;&gt;29</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1045.14,-342.69C1165.56,-397.45 1310.1,-463.17 1434.27,-519.63"/>
-<polygon fill="black" stroke="black" points="1433.01,-522.9 1443.56,-523.86 1435.9,-516.53 1433.01,-522.9"/>
+<title>26&#45;&gt;50</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1193.68,-775.23C1193.68,-794.51 1193.68,-814.87 1193.68,-835.45"/>
+<polygon fill="black" stroke="black" points="1190.18,-835.56 1193.68,-845.56 1197.18,-835.56 1190.18,-835.56"/>
 </g>
-<!-- 36 -->
-<g id="node8" class="node">
-<title>36</title>
-<polygon fill="#f2f2f2" stroke="black" points="820.84,-599.5 820.84,-699.5 1166.53,-699.5 1166.53,-599.5 820.84,-599.5"/>
-<text text-anchor="middle" x="993.68" y="-682.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
-<text text-anchor="middle" x="993.68" y="-666.1" font-family="Times,serif" font-size="14.00">IexecTokenSpender</text>
-<text text-anchor="middle" x="993.68" y="-649.3" font-family="Times,serif" font-size="14.00">contracts/interfaces/IexecTokenSpender.sol</text>
-<polyline fill="none" stroke="black" points="820.84,-641.1 1166.53,-641.1 "/>
-<text text-anchor="start" x="828.84" y="-624.5" font-family="Times,serif" font-size="14.00">External:</text>
-<text text-anchor="start" x="828.84" y="-607.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;receiveApproval(address, uint256, address, bytes): bool</text>
-</g>
-<!-- 11&#45;&gt;36 -->
-<g id="edge6" class="edge">
-<title>11&#45;&gt;36</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M900.54,-453.59C920.9,-496.2 940.86,-537.97 957.04,-571.84"/>
-<polygon fill="none" stroke="black" points="947.67,-576.57 970.08,-599.11 966.62,-567.52 947.67,-576.57"/>
-</g>
-<!-- 51 -->
-<g id="node10" class="node">
-<title>51</title>
-<polygon fill="#f2f2f2" stroke="black" points="1980.92,-845.7 1980.92,-1256.1 2414.45,-1256.1 2414.45,-845.7 1980.92,-845.7"/>
-<text text-anchor="middle" x="2197.68" y="-1239.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
-<text text-anchor="middle" x="2197.68" y="-1222.7" font-family="Times,serif" font-size="14.00">IexecLibOrders_v5</text>
-<text text-anchor="middle" x="2197.68" y="-1205.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="1980.92,-1197.7 2414.45,-1197.7 "/>
-<text text-anchor="start" x="1988.92" y="-1181.1" font-family="Times,serif" font-size="14.00">Public:</text>
-<text text-anchor="start" x="1988.92" y="-1164.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;EIP712DOMAIN_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="1988.92" y="-1147.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;APPORDER_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="1988.92" y="-1130.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;DATASETORDER_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="1988.92" y="-1113.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;WORKERPOOLORDER_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="1988.92" y="-1097.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;REQUESTORDER_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="1988.92" y="-1080.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;APPORDEROPERATION_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="1988.92" y="-1063.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;DATASETORDEROPERATION_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="1988.92" y="-1046.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;WORKERPOOLORDEROPERATION_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="1988.92" y="-1029.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;REQUESTORDEROPERATION_TYPEHASH: bytes32</text>
-<polyline fill="none" stroke="black" points="1980.92,-1021.7 2414.45,-1021.7 "/>
-<text text-anchor="start" x="1988.92" y="-1005.1" font-family="Times,serif" font-size="14.00">Public:</text>
-<text text-anchor="start" x="1988.92" y="-988.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_domain: EIP712Domain): (domainhash: bytes32)</text>
-<text text-anchor="start" x="1988.92" y="-971.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_apporder: AppOrder): (apphash: bytes32)</text>
-<text text-anchor="start" x="1988.92" y="-954.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_datasetorder: DatasetOrder): (datasethash: bytes32)</text>
-<text text-anchor="start" x="1988.92" y="-937.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_workerpoolorder: WorkerpoolOrder): (workerpoolhash: bytes32)</text>
-<text text-anchor="start" x="1988.92" y="-921.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_requestorder: RequestOrder): (requesthash: bytes32)</text>
-<text text-anchor="start" x="1988.92" y="-904.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_apporderoperation: AppOrderOperation): bytes32</text>
-<text text-anchor="start" x="1988.92" y="-887.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_datasetorderoperation: DatasetOrderOperation): bytes32</text>
-<text text-anchor="start" x="1988.92" y="-870.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_workerpoolorderoperation: WorkerpoolOrderOperation): bytes32</text>
-<text text-anchor="start" x="1988.92" y="-853.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_requestorderoperation: RequestOrderOperation): bytes32</text>
-</g>
-<!-- 11&#45;&gt;51 -->
-<g id="edge11" class="edge">
-<title>11&#45;&gt;51</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1045.41,-236.72C1414.92,-255.53 2074.79,-313.54 2221.68,-489.8 2300.09,-583.88 2295.62,-720.8 2270.8,-835.71"/>
-<polygon fill="black" stroke="black" points="2267.33,-835.18 2268.58,-845.7 2274.17,-836.7 2267.33,-835.18"/>
-</g>
-<!-- 11&#45;&gt;62 -->
-<g id="edge8" class="edge">
-<title>11&#45;&gt;62</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M775.69,-453.44C773.58,-562.69 780.15,-694.69 811.68,-809.2 827.64,-867.15 860.06,-926.31 888.9,-971.48"/>
-<polygon fill="black" stroke="black" points="886.06,-973.53 894.43,-980.03 891.94,-969.73 886.06,-973.53"/>
-</g>
-<!-- 11&#45;&gt;63 -->
-<g id="edge9" class="edge">
-<title>11&#45;&gt;63</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1045.2,-348.95C1097.54,-386.44 1145.8,-433.16 1175.68,-489.8 1255.75,-641.54 1141.84,-1094.48 1085.68,-1256.6 1082.59,-1265.54 1079.26,-1274.55 1075.74,-1283.59"/>
-<polygon fill="black" stroke="black" points="1072.44,-1282.42 1072.01,-1293.01 1078.95,-1285 1072.44,-1282.42"/>
-</g>
-<!-- 26&#45;&gt;25 -->
+<!-- 53 -->
+<g id="node13" class="node">
+<title>53</title>
+<polygon fill="#f2f2f2" stroke="black" points="389.07,-1875.3 389.07,-2092.9 612.29,-2092.9 612.29,-1875.3 389.07,-1875.3"/>
+<text text-anchor="middle" x="500.68" y="-2076.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="500.68" y="-2059.5" font-family="Times,serif" font-size="14.00">AppOrder</text>
+<text text-anchor="middle" x="500.68" y="-2042.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="389.07,-2034.5 612.29,-2034.5 "/>
+<text text-anchor="start" x="397.07" y="-2017.9" font-family="Times,serif" font-size="14.00">app: address</text>
+<text text-anchor="start" x="397.07" y="-2001.1" font-family="Times,serif" font-size="14.00">appprice: uint256</text>
+<text text-anchor="start" x="397.07" y="-1984.3" font-family="Times,serif" font-size="14.00">volume: uint256</text>
+<text text-anchor="start" x="397.07" y="-1967.5" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
+<text text-anchor="start" x="397.07" y="-1950.7" font-family="Times,serif" font-size="14.00">datasetrestrict: address</text>
+<text text-anchor="start" x="397.07" y="-1933.9" font-family="Times,serif" font-size="14.00">workerpoolrestrict: address</text>
+<text text-anchor="start" x="397.07" y="-1917.1" font-family="Times,serif" font-size="14.00">requesterrestrict: address</text>
+<text text-anchor="start" x="397.07" y="-1900.3" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
+<text text-anchor="start" x="397.07" y="-1883.5" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+</g>
+<!-- 26&#45;&gt;53 -->
 <g id="edge12" class="edge">
-<title>26&#45;&gt;25</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M214.68,-808.93C214.68,-848.76 214.68,-890.88 214.68,-928.57"/>
-<polygon fill="none" stroke="black" points="204.18,-928.71 214.68,-958.71 225.18,-928.71 204.18,-928.71"/>
-</g>
-<!-- 27 -->
-<g id="node6" class="node">
-<title>27</title>
-<polygon fill="#f2f2f2" stroke="black" points="550.78,-1934.1 550.78,-2034.1 820.59,-2034.1 820.59,-1934.1 550.78,-1934.1"/>
-<text text-anchor="middle" x="685.68" y="-2017.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
-<text text-anchor="middle" x="685.68" y="-2000.7" font-family="Times,serif" font-size="14.00">IexecHubV3Interface</text>
-<text text-anchor="middle" x="685.68" y="-1983.9" font-family="Times,serif" font-size="14.00">contracts/interfaces/IexecHubV3Interface.sol</text>
-<polyline fill="none" stroke="black" points="550.78,-1975.7 820.59,-1975.7 "/>
-<text text-anchor="start" x="558.78" y="-1959.1" font-family="Times,serif" font-size="14.00">External:</text>
-<text text-anchor="start" x="558.78" y="-1942.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;viewScore(worker: address): uint256</text>
-</g>
-<!-- 29&#45;&gt;51 -->
-<g id="edge13" class="edge">
-<title>29&#45;&gt;51</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1867.58,-775.23C1900.95,-803 1937.05,-833.03 1972.7,-862.69"/>
-<polygon fill="black" stroke="black" points="1970.85,-865.71 1980.77,-869.42 1975.33,-860.33 1970.85,-865.71"/>
+<title>26&#45;&gt;53</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M724.07,-775.23C669.99,-797.13 626.66,-820.78 605.68,-845.2 476.45,-995.66 485.04,-1605.28 494.99,-1865"/>
+<polygon fill="black" stroke="black" points="491.5,-1865.36 495.39,-1875.22 498.5,-1865.09 491.5,-1865.36"/>
 </g>
 <!-- 54 -->
-<g id="node13" class="node">
+<g id="node14" class="node">
 <title>54</title>
-<polygon fill="#f2f2f2" stroke="black" points="1657.07,-1875.3 1657.07,-2092.9 1880.29,-2092.9 1880.29,-1875.3 1657.07,-1875.3"/>
-<text text-anchor="middle" x="1768.68" y="-2076.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="1768.68" y="-2059.5" font-family="Times,serif" font-size="14.00">AppOrder</text>
-<text text-anchor="middle" x="1768.68" y="-2042.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="1657.07,-2034.5 1880.29,-2034.5 "/>
-<text text-anchor="start" x="1665.07" y="-2017.9" font-family="Times,serif" font-size="14.00">app: address</text>
-<text text-anchor="start" x="1665.07" y="-2001.1" font-family="Times,serif" font-size="14.00">appprice: uint256</text>
-<text text-anchor="start" x="1665.07" y="-1984.3" font-family="Times,serif" font-size="14.00">volume: uint256</text>
-<text text-anchor="start" x="1665.07" y="-1967.5" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
-<text text-anchor="start" x="1665.07" y="-1950.7" font-family="Times,serif" font-size="14.00">datasetrestrict: address</text>
-<text text-anchor="start" x="1665.07" y="-1933.9" font-family="Times,serif" font-size="14.00">workerpoolrestrict: address</text>
-<text text-anchor="start" x="1665.07" y="-1917.1" font-family="Times,serif" font-size="14.00">requesterrestrict: address</text>
-<text text-anchor="start" x="1665.07" y="-1900.3" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
-<text text-anchor="start" x="1665.07" y="-1883.5" font-family="Times,serif" font-size="14.00">sign: bytes</text>
-</g>
-<!-- 29&#45;&gt;54 -->
-<g id="edge15" class="edge">
-<title>29&#45;&gt;54</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1638.23,-775.46C1508.11,-997.63 1284.44,-1467.34 1498.68,-1780 1523.73,-1816.56 1554.2,-1792.34 1591.68,-1816 1615.34,-1830.93 1638.59,-1849.31 1660.08,-1868.36"/>
-<polygon fill="black" stroke="black" points="1657.82,-1871.04 1667.6,-1875.12 1662.5,-1865.83 1657.82,-1871.04"/>
+<polygon fill="#f2f2f2" stroke="black" points="630.07,-1875.3 630.07,-2092.9 853.29,-2092.9 853.29,-1875.3 630.07,-1875.3"/>
+<text text-anchor="middle" x="741.68" y="-2076.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="741.68" y="-2059.5" font-family="Times,serif" font-size="14.00">DatasetOrder</text>
+<text text-anchor="middle" x="741.68" y="-2042.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="630.07,-2034.5 853.29,-2034.5 "/>
+<text text-anchor="start" x="638.07" y="-2017.9" font-family="Times,serif" font-size="14.00">dataset: address</text>
+<text text-anchor="start" x="638.07" y="-2001.1" font-family="Times,serif" font-size="14.00">datasetprice: uint256</text>
+<text text-anchor="start" x="638.07" y="-1984.3" font-family="Times,serif" font-size="14.00">volume: uint256</text>
+<text text-anchor="start" x="638.07" y="-1967.5" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
+<text text-anchor="start" x="638.07" y="-1950.7" font-family="Times,serif" font-size="14.00">apprestrict: address</text>
+<text text-anchor="start" x="638.07" y="-1933.9" font-family="Times,serif" font-size="14.00">workerpoolrestrict: address</text>
+<text text-anchor="start" x="638.07" y="-1917.1" font-family="Times,serif" font-size="14.00">requesterrestrict: address</text>
+<text text-anchor="start" x="638.07" y="-1900.3" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
+<text text-anchor="start" x="638.07" y="-1883.5" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+</g>
+<!-- 26&#45;&gt;54 -->
+<g id="edge11" class="edge">
+<title>26&#45;&gt;54</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1013.74,-775.28C866.26,-889.95 669.35,-1074.85 589.68,-1292.6 515.25,-1496.03 512.7,-1577.52 589.68,-1780 597.29,-1800.01 608.31,-1799.28 621.68,-1816 634.53,-1832.06 647.67,-1849.35 660.31,-1866.5"/>
+<polygon fill="black" stroke="black" points="657.74,-1868.91 666.48,-1874.9 663.39,-1864.77 657.74,-1868.91"/>
 </g>
 <!-- 55 -->
-<g id="node14" class="node">
+<g id="node15" class="node">
 <title>55</title>
-<polygon fill="#f2f2f2" stroke="black" points="1359.07,-1875.3 1359.07,-2092.9 1582.29,-2092.9 1582.29,-1875.3 1359.07,-1875.3"/>
-<text text-anchor="middle" x="1470.68" y="-2076.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="1470.68" y="-2059.5" font-family="Times,serif" font-size="14.00">DatasetOrder</text>
-<text text-anchor="middle" x="1470.68" y="-2042.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="1359.07,-2034.5 1582.29,-2034.5 "/>
-<text text-anchor="start" x="1367.07" y="-2017.9" font-family="Times,serif" font-size="14.00">dataset: address</text>
-<text text-anchor="start" x="1367.07" y="-2001.1" font-family="Times,serif" font-size="14.00">datasetprice: uint256</text>
-<text text-anchor="start" x="1367.07" y="-1984.3" font-family="Times,serif" font-size="14.00">volume: uint256</text>
-<text text-anchor="start" x="1367.07" y="-1967.5" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
-<text text-anchor="start" x="1367.07" y="-1950.7" font-family="Times,serif" font-size="14.00">apprestrict: address</text>
-<text text-anchor="start" x="1367.07" y="-1933.9" font-family="Times,serif" font-size="14.00">workerpoolrestrict: address</text>
-<text text-anchor="start" x="1367.07" y="-1917.1" font-family="Times,serif" font-size="14.00">requesterrestrict: address</text>
-<text text-anchor="start" x="1367.07" y="-1900.3" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
-<text text-anchor="start" x="1367.07" y="-1883.5" font-family="Times,serif" font-size="14.00">sign: bytes</text>
-</g>
-<!-- 29&#45;&gt;55 -->
-<g id="edge14" class="edge">
-<title>29&#45;&gt;55</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1491.79,-775.14C1469.37,-795.81 1449.48,-819.14 1434.68,-845.2 1247.75,-1174.38 1360.68,-1647.93 1429.41,-1865.57"/>
-<polygon fill="black" stroke="black" points="1426.08,-1866.64 1432.45,-1875.11 1432.75,-1864.52 1426.08,-1866.64"/>
+<polygon fill="#f2f2f2" stroke="black" points="1306.07,-1858.5 1306.07,-2109.7 1529.29,-2109.7 1529.29,-1858.5 1306.07,-1858.5"/>
+<text text-anchor="middle" x="1417.68" y="-2093.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="1417.68" y="-2076.3" font-family="Times,serif" font-size="14.00">WorkerpoolOrder</text>
+<text text-anchor="middle" x="1417.68" y="-2059.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="1306.07,-2051.3 1529.29,-2051.3 "/>
+<text text-anchor="start" x="1314.07" y="-2034.7" font-family="Times,serif" font-size="14.00">workerpool: address</text>
+<text text-anchor="start" x="1314.07" y="-2017.9" font-family="Times,serif" font-size="14.00">workerpoolprice: uint256</text>
+<text text-anchor="start" x="1314.07" y="-2001.1" font-family="Times,serif" font-size="14.00">volume: uint256</text>
+<text text-anchor="start" x="1314.07" y="-1984.3" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
+<text text-anchor="start" x="1314.07" y="-1967.5" font-family="Times,serif" font-size="14.00">category: uint256</text>
+<text text-anchor="start" x="1314.07" y="-1950.7" font-family="Times,serif" font-size="14.00">trust: uint256</text>
+<text text-anchor="start" x="1314.07" y="-1933.9" font-family="Times,serif" font-size="14.00">apprestrict: address</text>
+<text text-anchor="start" x="1314.07" y="-1917.1" font-family="Times,serif" font-size="14.00">datasetrestrict: address</text>
+<text text-anchor="start" x="1314.07" y="-1900.3" font-family="Times,serif" font-size="14.00">requesterrestrict: address</text>
+<text text-anchor="start" x="1314.07" y="-1883.5" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
+<text text-anchor="start" x="1314.07" y="-1866.7" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+</g>
+<!-- 26&#45;&gt;55 -->
+<g id="edge13" class="edge">
+<title>26&#45;&gt;55</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1445.59,-775.33C1632.94,-883.57 1874.58,-1059.51 1985.68,-1292.6 2008.98,-1341.49 2022.18,-1739.99 1985.68,-1780 1926.88,-1844.47 1674.2,-1780.08 1594.68,-1816 1574.31,-1825.2 1554.8,-1837.74 1536.66,-1851.83"/>
+<polygon fill="black" stroke="black" points="1534.05,-1849.43 1528.43,-1858.41 1538.42,-1854.9 1534.05,-1849.43"/>
 </g>
 <!-- 56 -->
-<g id="node15" class="node">
+<g id="node16" class="node">
 <title>56</title>
-<polygon fill="#f2f2f2" stroke="black" points="2235.07,-1858.5 2235.07,-2109.7 2458.29,-2109.7 2458.29,-1858.5 2235.07,-1858.5"/>
-<text text-anchor="middle" x="2346.68" y="-2093.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="2346.68" y="-2076.3" font-family="Times,serif" font-size="14.00">WorkerpoolOrder</text>
-<text text-anchor="middle" x="2346.68" y="-2059.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="2235.07,-2051.3 2458.29,-2051.3 "/>
-<text text-anchor="start" x="2243.07" y="-2034.7" font-family="Times,serif" font-size="14.00">workerpool: address</text>
-<text text-anchor="start" x="2243.07" y="-2017.9" font-family="Times,serif" font-size="14.00">workerpoolprice: uint256</text>
-<text text-anchor="start" x="2243.07" y="-2001.1" font-family="Times,serif" font-size="14.00">volume: uint256</text>
-<text text-anchor="start" x="2243.07" y="-1984.3" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
-<text text-anchor="start" x="2243.07" y="-1967.5" font-family="Times,serif" font-size="14.00">category: uint256</text>
-<text text-anchor="start" x="2243.07" y="-1950.7" font-family="Times,serif" font-size="14.00">trust: uint256</text>
-<text text-anchor="start" x="2243.07" y="-1933.9" font-family="Times,serif" font-size="14.00">apprestrict: address</text>
-<text text-anchor="start" x="2243.07" y="-1917.1" font-family="Times,serif" font-size="14.00">datasetrestrict: address</text>
-<text text-anchor="start" x="2243.07" y="-1900.3" font-family="Times,serif" font-size="14.00">requesterrestrict: address</text>
-<text text-anchor="start" x="2243.07" y="-1883.5" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
-<text text-anchor="start" x="2243.07" y="-1866.7" font-family="Times,serif" font-size="14.00">sign: bytes</text>
-</g>
-<!-- 29&#45;&gt;56 -->
-<g id="edge16" class="edge">
-<title>29&#45;&gt;56</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2213.35,-750.86C2286.54,-775.88 2359,-806.88 2423.68,-845.2 2662.02,-986.4 2753.62,-1035.86 2857.68,-1292.6 2939.06,-1493.36 2980.13,-1601.3 2857.68,-1780 2832.63,-1816.56 2805.93,-1799.77 2764.68,-1816 2664.54,-1855.4 2551.2,-1900.76 2467.82,-1934.26"/>
-<polygon fill="black" stroke="black" points="2466.29,-1931.11 2458.32,-1938.09 2468.9,-1937.6 2466.29,-1931.11"/>
+<polygon fill="#f2f2f2" stroke="black" points="1604.07,-1816.5 1604.07,-2151.7 1827.29,-2151.7 1827.29,-1816.5 1604.07,-1816.5"/>
+<text text-anchor="middle" x="1715.68" y="-2135.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="1715.68" y="-2118.3" font-family="Times,serif" font-size="14.00">RequestOrder</text>
+<text text-anchor="middle" x="1715.68" y="-2101.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="1604.07,-2093.3 1827.29,-2093.3 "/>
+<text text-anchor="start" x="1612.07" y="-2076.7" font-family="Times,serif" font-size="14.00">app: address</text>
+<text text-anchor="start" x="1612.07" y="-2059.9" font-family="Times,serif" font-size="14.00">appmaxprice: uint256</text>
+<text text-anchor="start" x="1612.07" y="-2043.1" font-family="Times,serif" font-size="14.00">dataset: address</text>
+<text text-anchor="start" x="1612.07" y="-2026.3" font-family="Times,serif" font-size="14.00">datasetmaxprice: uint256</text>
+<text text-anchor="start" x="1612.07" y="-2009.5" font-family="Times,serif" font-size="14.00">workerpool: address</text>
+<text text-anchor="start" x="1612.07" y="-1992.7" font-family="Times,serif" font-size="14.00">workerpoolmaxprice: uint256</text>
+<text text-anchor="start" x="1612.07" y="-1975.9" font-family="Times,serif" font-size="14.00">requester: address</text>
+<text text-anchor="start" x="1612.07" y="-1959.1" font-family="Times,serif" font-size="14.00">volume: uint256</text>
+<text text-anchor="start" x="1612.07" y="-1942.3" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
+<text text-anchor="start" x="1612.07" y="-1925.5" font-family="Times,serif" font-size="14.00">category: uint256</text>
+<text text-anchor="start" x="1612.07" y="-1908.7" font-family="Times,serif" font-size="14.00">trust: uint256</text>
+<text text-anchor="start" x="1612.07" y="-1891.9" font-family="Times,serif" font-size="14.00">beneficiary: address</text>
+<text text-anchor="start" x="1612.07" y="-1875.1" font-family="Times,serif" font-size="14.00">callback: address</text>
+<text text-anchor="start" x="1612.07" y="-1858.3" font-family="Times,serif" font-size="14.00">params: string</text>
+<text text-anchor="start" x="1612.07" y="-1841.5" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
+<text text-anchor="start" x="1612.07" y="-1824.7" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+</g>
+<!-- 26&#45;&gt;56 -->
+<g id="edge14" class="edge">
+<title>26&#45;&gt;56</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1600.85,-775.11C1686.98,-803.97 1757.37,-830.51 1774.68,-845.2 1946.28,-990.76 1957.41,-1074.22 2011.68,-1292.6 2063.92,-1502.83 2112.62,-1588.33 2011.68,-1780 1974.65,-1850.31 1901.08,-1900.96 1836.56,-1934.1"/>
+<polygon fill="black" stroke="black" points="1834.87,-1931.03 1827.52,-1938.66 1838.02,-1937.28 1834.87,-1931.03"/>
 </g>
-<!-- 57 -->
-<g id="node16" class="node">
-<title>57</title>
-<polygon fill="#f2f2f2" stroke="black" points="2774.07,-1816.5 2774.07,-2151.7 2997.29,-2151.7 2997.29,-1816.5 2774.07,-1816.5"/>
-<text text-anchor="middle" x="2885.68" y="-2135.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="2885.68" y="-2118.3" font-family="Times,serif" font-size="14.00">RequestOrder</text>
-<text text-anchor="middle" x="2885.68" y="-2101.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="2774.07,-2093.3 2997.29,-2093.3 "/>
-<text text-anchor="start" x="2782.07" y="-2076.7" font-family="Times,serif" font-size="14.00">app: address</text>
-<text text-anchor="start" x="2782.07" y="-2059.9" font-family="Times,serif" font-size="14.00">appmaxprice: uint256</text>
-<text text-anchor="start" x="2782.07" y="-2043.1" font-family="Times,serif" font-size="14.00">dataset: address</text>
-<text text-anchor="start" x="2782.07" y="-2026.3" font-family="Times,serif" font-size="14.00">datasetmaxprice: uint256</text>
-<text text-anchor="start" x="2782.07" y="-2009.5" font-family="Times,serif" font-size="14.00">workerpool: address</text>
-<text text-anchor="start" x="2782.07" y="-1992.7" font-family="Times,serif" font-size="14.00">workerpoolmaxprice: uint256</text>
-<text text-anchor="start" x="2782.07" y="-1975.9" font-family="Times,serif" font-size="14.00">requester: address</text>
-<text text-anchor="start" x="2782.07" y="-1959.1" font-family="Times,serif" font-size="14.00">volume: uint256</text>
-<text text-anchor="start" x="2782.07" y="-1942.3" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
-<text text-anchor="start" x="2782.07" y="-1925.5" font-family="Times,serif" font-size="14.00">category: uint256</text>
-<text text-anchor="start" x="2782.07" y="-1908.7" font-family="Times,serif" font-size="14.00">trust: uint256</text>
-<text text-anchor="start" x="2782.07" y="-1891.9" font-family="Times,serif" font-size="14.00">beneficiary: address</text>
-<text text-anchor="start" x="2782.07" y="-1875.1" font-family="Times,serif" font-size="14.00">callback: address</text>
-<text text-anchor="start" x="2782.07" y="-1858.3" font-family="Times,serif" font-size="14.00">params: string</text>
-<text text-anchor="start" x="2782.07" y="-1841.5" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
-<text text-anchor="start" x="2782.07" y="-1824.7" font-family="Times,serif" font-size="14.00">sign: bytes</text>
-</g>
-<!-- 29&#45;&gt;57 -->
-<g id="edge17" class="edge">
-<title>29&#45;&gt;57</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2213.37,-717.86C2394.54,-750.04 2572.95,-793.03 2645.68,-845.2 2833.29,-979.77 2848.87,-1069.87 2909.68,-1292.6 2956.08,-1462.53 2941.35,-1664.72 2920.35,-1806.24"/>
-<polygon fill="black" stroke="black" points="2916.86,-1805.91 2918.83,-1816.32 2923.78,-1806.96 2916.86,-1805.91"/>
+<!-- 35&#45;&gt;61 -->
+<g id="edge15" class="edge">
+<title>35&#45;&gt;61</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2343.6,-792.16C2357.06,-851.88 2372.23,-919.19 2383.69,-970.04"/>
+<polygon fill="black" stroke="black" points="2380.31,-971 2385.93,-979.99 2387.14,-969.46 2380.31,-971"/>
+</g>
+<!-- 35&#45;&gt;62 -->
+<g id="edge16" class="edge">
+<title>35&#45;&gt;62</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2270.09,-792.16C2266.22,-809.89 2262.91,-827.87 2260.68,-845.2 2237.32,-1026.55 2218.25,-1078.75 2260.68,-1256.6 2262.81,-1265.51 2265.27,-1274.46 2268,-1283.4"/>
+<polygon fill="black" stroke="black" points="2264.72,-1284.62 2271.08,-1293.09 2271.39,-1282.5 2264.72,-1284.62"/>
 </g>
-<!-- 37 -->
+<!-- 36 -->
 <g id="node9" class="node">
-<title>37</title>
-<polygon fill="#f2f2f2" stroke="black" points="838.51,-1954.9 838.51,-2013.3 1050.85,-2013.3 1050.85,-1954.9 838.51,-1954.9"/>
-<text text-anchor="middle" x="944.68" y="-1996.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
-<text text-anchor="middle" x="944.68" y="-1979.9" font-family="Times,serif" font-size="14.00">IexecLibCore_v5</text>
-<text text-anchor="middle" x="944.68" y="-1963.1" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<title>36</title>
+<polygon fill="#f2f2f2" stroke="black" points="2295.51,-1954.9 2295.51,-2013.3 2507.85,-2013.3 2507.85,-1954.9 2295.51,-1954.9"/>
+<text text-anchor="middle" x="2401.68" y="-1996.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
+<text text-anchor="middle" x="2401.68" y="-1979.9" font-family="Times,serif" font-size="14.00">IexecLibCore_v5</text>
+<text text-anchor="middle" x="2401.68" y="-1963.1" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
 </g>
-<!-- 53 -->
+<!-- 52 -->
 <g id="node12" class="node">
-<title>53</title>
-<polygon fill="#f2f2f2" stroke="black" points="2384.07,-1469.5 2384.07,-1603.1 2607.29,-1603.1 2607.29,-1469.5 2384.07,-1469.5"/>
-<text text-anchor="middle" x="2495.68" y="-1586.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="2495.68" y="-1569.7" font-family="Times,serif" font-size="14.00">EIP712Domain</text>
-<text text-anchor="middle" x="2495.68" y="-1552.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="2384.07,-1544.7 2607.29,-1544.7 "/>
-<text text-anchor="start" x="2392.07" y="-1528.1" font-family="Times,serif" font-size="14.00">name: string</text>
-<text text-anchor="start" x="2392.07" y="-1511.3" font-family="Times,serif" font-size="14.00">version: string</text>
-<text text-anchor="start" x="2392.07" y="-1494.5" font-family="Times,serif" font-size="14.00">chainId: uint256</text>
-<text text-anchor="start" x="2392.07" y="-1477.7" font-family="Times,serif" font-size="14.00">verifyingContract: address</text>
-</g>
-<!-- 51&#45;&gt;53 -->
+<title>52</title>
+<polygon fill="#f2f2f2" stroke="black" points="1753.07,-1469.5 1753.07,-1603.1 1976.29,-1603.1 1976.29,-1469.5 1753.07,-1469.5"/>
+<text text-anchor="middle" x="1864.68" y="-1586.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="1864.68" y="-1569.7" font-family="Times,serif" font-size="14.00">EIP712Domain</text>
+<text text-anchor="middle" x="1864.68" y="-1552.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="1753.07,-1544.7 1976.29,-1544.7 "/>
+<text text-anchor="start" x="1761.07" y="-1528.1" font-family="Times,serif" font-size="14.00">name: string</text>
+<text text-anchor="start" x="1761.07" y="-1511.3" font-family="Times,serif" font-size="14.00">version: string</text>
+<text text-anchor="start" x="1761.07" y="-1494.5" font-family="Times,serif" font-size="14.00">chainId: uint256</text>
+<text text-anchor="start" x="1761.07" y="-1477.7" font-family="Times,serif" font-size="14.00">verifyingContract: address</text>
+</g>
+<!-- 50&#45;&gt;52 -->
+<g id="edge27" class="edge">
+<title>50&#45;&gt;52</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1410.69,-1112.89C1516.66,-1150.78 1640.23,-1208.61 1729.68,-1292.6 1778.49,-1338.43 1811.76,-1407.42 1833.31,-1460.15"/>
+<polygon fill="black" stroke="black" points="1830.08,-1461.5 1837.06,-1469.46 1836.57,-1458.88 1830.08,-1461.5"/>
+</g>
+<!-- 50&#45;&gt;53 -->
 <g id="edge28" class="edge">
-<title>51&#45;&gt;53</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2337.75,-1256.41C2345.67,-1268.54 2353.37,-1280.67 2360.68,-1292.6 2394.13,-1347.19 2427.3,-1411.62 2452.52,-1460.37"/>
-<polygon fill="black" stroke="black" points="2449.43,-1462.01 2457.14,-1469.28 2455.65,-1458.79 2449.43,-1462.01"/>
+<title>50&#45;&gt;53</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M976.57,-1080.54C841.19,-1110.3 675.31,-1170.64 580.68,-1292.6 452.39,-1457.95 456.92,-1715.5 476.08,-1864.89"/>
+<polygon fill="black" stroke="black" points="472.64,-1865.56 477.43,-1875.02 479.58,-1864.64 472.64,-1865.56"/>
 </g>
-<!-- 51&#45;&gt;54 -->
+<!-- 50&#45;&gt;54 -->
 <g id="edge29" class="edge">
-<title>51&#45;&gt;54</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1980.74,-1127.8C1906.45,-1165.6 1831.17,-1219.27 1787.68,-1292.6 1732.17,-1386.19 1741.27,-1693.81 1754.49,-1865.17"/>
-<polygon fill="black" stroke="black" points="1751,-1865.55 1755.28,-1875.25 1757.98,-1865 1751,-1865.55"/>
+<title>50&#45;&gt;54</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M976.64,-1082.29C848.7,-1112.64 696.85,-1172.99 617.68,-1292.6 557.9,-1382.92 590.09,-1675.26 617.68,-1780 625.46,-1809.52 638.62,-1839.26 653.55,-1866.53"/>
+<polygon fill="black" stroke="black" points="650.52,-1868.28 658.46,-1875.29 656.63,-1864.86 650.52,-1868.28"/>
 </g>
-<!-- 51&#45;&gt;55 -->
+<!-- 50&#45;&gt;55 -->
 <g id="edge30" class="edge">
-<title>51&#45;&gt;55</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1980.65,-1063.18C1817.18,-1084.06 1602.62,-1140.86 1489.68,-1292.6 1365.74,-1459.13 1396.54,-1715.98 1432.31,-1864.98"/>
-<polygon fill="black" stroke="black" points="1429.01,-1866.2 1434.79,-1875.08 1435.81,-1864.54 1429.01,-1866.2"/>
+<title>50&#45;&gt;55</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1364.18,-1256.12C1370.43,-1268.06 1376.01,-1280.25 1380.68,-1292.6 1417.81,-1390.65 1417.29,-1676.64 1416.09,-1848.27"/>
+<polygon fill="black" stroke="black" points="1412.59,-1848.36 1416.02,-1858.38 1419.59,-1848.41 1412.59,-1848.36"/>
 </g>
-<!-- 51&#45;&gt;56 -->
+<!-- 50&#45;&gt;56 -->
 <g id="edge31" class="edge">
-<title>51&#45;&gt;56</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2298.46,-1256.12C2302.75,-1268.28 2306.55,-1280.49 2309.68,-1292.6 2358.36,-1480.75 2356.65,-1707.26 2351.1,-1848.25"/>
-<polygon fill="black" stroke="black" points="2347.6,-1848.12 2350.7,-1858.25 2354.6,-1848.4 2347.6,-1848.12"/>
+<title>50&#45;&gt;56</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1410.6,-1105.21C1509.4,-1140.99 1617.67,-1199.27 1678.68,-1292.6 1731.97,-1374.12 1728.93,-1629.95 1721.87,-1806.21"/>
+<polygon fill="black" stroke="black" points="1718.37,-1806.25 1721.46,-1816.39 1725.36,-1806.54 1718.37,-1806.25"/>
 </g>
-<!-- 51&#45;&gt;57 -->
+<!-- 57 -->
+<g id="node17" class="node">
+<title>57</title>
+<polygon fill="#f2f2f2" stroke="black" points="636.07,-1477.9 636.07,-1594.7 859.29,-1594.7 859.29,-1477.9 636.07,-1477.9"/>
+<text text-anchor="middle" x="747.68" y="-1578.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="747.68" y="-1561.3" font-family="Times,serif" font-size="14.00">AppOrderOperation</text>
+<text text-anchor="middle" x="747.68" y="-1544.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="636.07,-1536.3 859.29,-1536.3 "/>
+<text text-anchor="start" x="644.07" y="-1519.7" font-family="Times,serif" font-size="14.00">order: AppOrder</text>
+<text text-anchor="start" x="644.07" y="-1502.9" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
+<text text-anchor="start" x="644.07" y="-1486.1" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+</g>
+<!-- 50&#45;&gt;57 -->
 <g id="edge32" class="edge">
-<title>51&#45;&gt;57</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2414.63,-1070.92C2562.37,-1096.39 2748.6,-1155.57 2848.68,-1292.6 2956.07,-1439.64 2945.98,-1655.01 2921.82,-1806.02"/>
-<polygon fill="black" stroke="black" points="2918.3,-1805.89 2920.14,-1816.33 2925.21,-1807.02 2918.3,-1805.89"/>
+<title>50&#45;&gt;57</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M976.82,-1182.38C934.28,-1214.98 892.44,-1252.28 858.68,-1292.6 814.74,-1345.08 781.97,-1416.38 763.52,-1468.12"/>
+<polygon fill="black" stroke="black" points="760.11,-1467.27 760.14,-1477.86 766.72,-1469.57 760.11,-1467.27"/>
 </g>
 <!-- 58 -->
-<g id="node17" class="node">
+<g id="node18" class="node">
 <title>58</title>
-<polygon fill="#f2f2f2" stroke="black" points="1806.07,-1477.9 1806.07,-1594.7 2029.29,-1594.7 2029.29,-1477.9 1806.07,-1477.9"/>
-<text text-anchor="middle" x="1917.68" y="-1578.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="1917.68" y="-1561.3" font-family="Times,serif" font-size="14.00">AppOrderOperation</text>
-<text text-anchor="middle" x="1917.68" y="-1544.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="1806.07,-1536.3 2029.29,-1536.3 "/>
-<text text-anchor="start" x="1814.07" y="-1519.7" font-family="Times,serif" font-size="14.00">order: AppOrder</text>
-<text text-anchor="start" x="1814.07" y="-1502.9" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
-<text text-anchor="start" x="1814.07" y="-1486.1" font-family="Times,serif" font-size="14.00">sign: bytes</text>
-</g>
-<!-- 51&#45;&gt;58 -->
+<polygon fill="#f2f2f2" stroke="black" points="877.07,-1477.9 877.07,-1594.7 1100.29,-1594.7 1100.29,-1477.9 877.07,-1477.9"/>
+<text text-anchor="middle" x="988.68" y="-1578.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="988.68" y="-1561.3" font-family="Times,serif" font-size="14.00">DatasetOrderOperation</text>
+<text text-anchor="middle" x="988.68" y="-1544.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="877.07,-1536.3 1100.29,-1536.3 "/>
+<text text-anchor="start" x="885.07" y="-1519.7" font-family="Times,serif" font-size="14.00">order: DatasetOrder</text>
+<text text-anchor="start" x="885.07" y="-1502.9" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
+<text text-anchor="start" x="885.07" y="-1486.1" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+</g>
+<!-- 50&#45;&gt;58 -->
 <g id="edge33" class="edge">
-<title>51&#45;&gt;58</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2056.16,-1256.3C2048.77,-1268.52 2041.57,-1280.68 2034.68,-1292.6 2000.98,-1350.91 1965.94,-1419.12 1942.92,-1468.36"/>
-<polygon fill="black" stroke="black" points="1939.66,-1467.09 1938.63,-1477.63 1946.01,-1470.03 1939.66,-1467.09"/>
+<title>50&#45;&gt;58</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1100.36,-1256.2C1067.85,-1332.17 1034.11,-1413.18 1012.28,-1468.25"/>
+<polygon fill="black" stroke="black" points="1008.89,-1467.29 1008.48,-1477.88 1015.4,-1469.86 1008.89,-1467.29"/>
 </g>
 <!-- 59 -->
-<g id="node18" class="node">
+<g id="node19" class="node">
 <title>59</title>
-<polygon fill="#f2f2f2" stroke="black" points="1508.07,-1477.9 1508.07,-1594.7 1731.29,-1594.7 1731.29,-1477.9 1508.07,-1477.9"/>
-<text text-anchor="middle" x="1619.68" y="-1578.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="1619.68" y="-1561.3" font-family="Times,serif" font-size="14.00">DatasetOrderOperation</text>
-<text text-anchor="middle" x="1619.68" y="-1544.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="1508.07,-1536.3 1731.29,-1536.3 "/>
-<text text-anchor="start" x="1516.07" y="-1519.7" font-family="Times,serif" font-size="14.00">order: DatasetOrder</text>
-<text text-anchor="start" x="1516.07" y="-1502.9" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
-<text text-anchor="start" x="1516.07" y="-1486.1" font-family="Times,serif" font-size="14.00">sign: bytes</text>
-</g>
-<!-- 51&#45;&gt;59 -->
+<polygon fill="#f2f2f2" stroke="black" points="1157.07,-1477.9 1157.07,-1594.7 1380.29,-1594.7 1380.29,-1477.9 1157.07,-1477.9"/>
+<text text-anchor="middle" x="1268.68" y="-1578.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="1268.68" y="-1561.3" font-family="Times,serif" font-size="14.00">WorkerpoolOrderOperation</text>
+<text text-anchor="middle" x="1268.68" y="-1544.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="1157.07,-1536.3 1380.29,-1536.3 "/>
+<text text-anchor="start" x="1165.07" y="-1519.7" font-family="Times,serif" font-size="14.00">order: WorkerpoolOrder</text>
+<text text-anchor="start" x="1165.07" y="-1502.9" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
+<text text-anchor="start" x="1165.07" y="-1486.1" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+</g>
+<!-- 50&#45;&gt;59 -->
 <g id="edge34" class="edge">
-<title>51&#45;&gt;59</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1980.85,-1130.71C1896.91,-1169.86 1804.84,-1223.72 1736.68,-1292.6 1687.48,-1342.32 1653.18,-1415.19 1634.64,-1468.11"/>
-<polygon fill="black" stroke="black" points="1631.27,-1467.15 1631.36,-1477.74 1637.89,-1469.4 1631.27,-1467.15"/>
+<title>50&#45;&gt;59</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1218.7,-1256.2C1230.17,-1332.01 1243.32,-1412.85 1253.37,-1467.9"/>
+<polygon fill="black" stroke="black" points="1249.96,-1468.68 1255.22,-1477.88 1256.84,-1467.41 1249.96,-1468.68"/>
 </g>
 <!-- 60 -->
-<g id="node19" class="node">
+<g id="node20" class="node">
 <title>60</title>
-<polygon fill="#f2f2f2" stroke="black" points="2086.07,-1477.9 2086.07,-1594.7 2309.29,-1594.7 2309.29,-1477.9 2086.07,-1477.9"/>
-<text text-anchor="middle" x="2197.68" y="-1578.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="2197.68" y="-1561.3" font-family="Times,serif" font-size="14.00">WorkerpoolOrderOperation</text>
-<text text-anchor="middle" x="2197.68" y="-1544.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="2086.07,-1536.3 2309.29,-1536.3 "/>
-<text text-anchor="start" x="2094.07" y="-1519.7" font-family="Times,serif" font-size="14.00">order: WorkerpoolOrder</text>
-<text text-anchor="start" x="2094.07" y="-1502.9" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
-<text text-anchor="start" x="2094.07" y="-1486.1" font-family="Times,serif" font-size="14.00">sign: bytes</text>
-</g>
-<!-- 51&#45;&gt;60 -->
+<polygon fill="#f2f2f2" stroke="black" points="1455.07,-1477.9 1455.07,-1594.7 1678.29,-1594.7 1678.29,-1477.9 1455.07,-1477.9"/>
+<text text-anchor="middle" x="1566.68" y="-1578.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="1566.68" y="-1561.3" font-family="Times,serif" font-size="14.00">RequestOrderOperation</text>
+<text text-anchor="middle" x="1566.68" y="-1544.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="1455.07,-1536.3 1678.29,-1536.3 "/>
+<text text-anchor="start" x="1463.07" y="-1519.7" font-family="Times,serif" font-size="14.00">order: RequestOrder</text>
+<text text-anchor="start" x="1463.07" y="-1502.9" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
+<text text-anchor="start" x="1463.07" y="-1486.1" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+</g>
+<!-- 50&#45;&gt;60 -->
 <g id="edge35" class="edge">
-<title>51&#45;&gt;60</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2191,-1256.2C2190.71,-1331.85 2191.31,-1412.51 2192.82,-1467.56"/>
-<polygon fill="black" stroke="black" points="2189.33,-1467.98 2193.12,-1477.88 2196.33,-1467.78 2189.33,-1467.98"/>
-</g>
-<!-- 61 -->
-<g id="node20" class="node">
-<title>61</title>
-<polygon fill="#f2f2f2" stroke="black" points="2625.07,-1477.9 2625.07,-1594.7 2848.29,-1594.7 2848.29,-1477.9 2625.07,-1477.9"/>
-<text text-anchor="middle" x="2736.68" y="-1578.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="2736.68" y="-1561.3" font-family="Times,serif" font-size="14.00">RequestOrderOperation</text>
-<text text-anchor="middle" x="2736.68" y="-1544.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="2625.07,-1536.3 2848.29,-1536.3 "/>
-<text text-anchor="start" x="2633.07" y="-1519.7" font-family="Times,serif" font-size="14.00">order: RequestOrder</text>
-<text text-anchor="start" x="2633.07" y="-1502.9" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
-<text text-anchor="start" x="2633.07" y="-1486.1" font-family="Times,serif" font-size="14.00">sign: bytes</text>
-</g>
-<!-- 51&#45;&gt;61 -->
-<g id="edge36" class="edge">
-<title>51&#45;&gt;61</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2414.46,-1149.59C2482.28,-1187.03 2553.47,-1234.9 2607.68,-1292.6 2655.03,-1342.99 2687.58,-1415.6 2708.42,-1468.26"/>
-<polygon fill="black" stroke="black" points="2705.27,-1469.81 2712.18,-1477.85 2711.79,-1467.26 2705.27,-1469.81"/>
+<title>50&#45;&gt;60</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1402.99,-1256.45C1413.03,-1268.37 1422.67,-1280.46 1431.68,-1292.6 1472.57,-1347.69 1507.45,-1417.91 1531.69,-1468.64"/>
+<polygon fill="black" stroke="black" points="1528.63,-1470.35 1536.09,-1477.87 1534.95,-1467.34 1528.63,-1470.35"/>
 </g>
-<!-- 52 -->
+<!-- 51 -->
 <g id="node11" class="node">
-<title>52</title>
-<polygon fill="#f2f2f2" stroke="black" points="1946.07,-1934.1 1946.07,-2034.1 2169.29,-2034.1 2169.29,-1934.1 1946.07,-1934.1"/>
-<text text-anchor="middle" x="2057.68" y="-2017.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Enum&gt;&gt;</text>
-<text text-anchor="middle" x="2057.68" y="-2000.7" font-family="Times,serif" font-size="14.00">OrderOperationEnum</text>
-<text text-anchor="middle" x="2057.68" y="-1983.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="1946.07,-1975.7 2169.29,-1975.7 "/>
-<text text-anchor="start" x="1954.07" y="-1959.1" font-family="Times,serif" font-size="14.00">SIGN: 0</text>
-<text text-anchor="start" x="1954.07" y="-1942.3" font-family="Times,serif" font-size="14.00">CLOSE: 1</text>
-</g>
-<!-- 52&#45;&gt;51 -->
+<title>51</title>
+<polygon fill="#f2f2f2" stroke="black" points="1017.07,-1934.1 1017.07,-2034.1 1240.29,-2034.1 1240.29,-1934.1 1017.07,-1934.1"/>
+<text text-anchor="middle" x="1128.68" y="-2017.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Enum&gt;&gt;</text>
+<text text-anchor="middle" x="1128.68" y="-2000.7" font-family="Times,serif" font-size="14.00">OrderOperationEnum</text>
+<text text-anchor="middle" x="1128.68" y="-1983.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="1017.07,-1975.7 1240.29,-1975.7 "/>
+<text text-anchor="start" x="1025.07" y="-1959.1" font-family="Times,serif" font-size="14.00">SIGN: 0</text>
+<text text-anchor="start" x="1025.07" y="-1942.3" font-family="Times,serif" font-size="14.00">CLOSE: 1</text>
+</g>
+<!-- 51&#45;&gt;50 -->
+<g id="edge17" class="edge">
+<title>51&#45;&gt;50</title>
+<path fill="none" stroke="black" d="M1127.32,-1933.94C1124.78,-1820.52 1121.69,-1531.94 1147.68,-1292.6 1148.55,-1284.64 1149.53,-1276.56 1150.62,-1268.4"/>
+<polygon fill="black" stroke="black" points="1150.63,-1268.3 1147.49,-1261.81 1152.27,-1256.41 1155.41,-1262.9 1150.63,-1268.3"/>
+</g>
+<!-- 52&#45;&gt;50 -->
 <g id="edge18" class="edge">
-<title>52&#45;&gt;51</title>
-<path fill="none" stroke="black" d="M2056.26,-1933.62C2052.77,-1796.54 2046.12,-1413.98 2076.68,-1292.6 2078.74,-1284.43 2081.1,-1276.22 2083.73,-1268.01"/>
-<polygon fill="black" stroke="black" points="2083.8,-1267.8 2081.9,-1260.84 2087.6,-1256.42 2089.49,-1263.38 2083.8,-1267.8"/>
+<title>52&#45;&gt;50</title>
+<path fill="none" stroke="black" d="M1851.48,-1469.46C1833.7,-1415.79 1799.42,-1341.18 1747.68,-1292.6 1656.92,-1207.38 1531.02,-1149.09 1422.16,-1111.24"/>
+<polygon fill="black" stroke="black" points="1422.02,-1111.19 1415.05,-1113.03 1410.67,-1107.3 1417.64,-1105.46 1422.02,-1111.19"/>
 </g>
-<!-- 53&#45;&gt;51 -->
+<!-- 53&#45;&gt;50 -->
 <g id="edge19" class="edge">
-<title>53&#45;&gt;51</title>
-<path fill="none" stroke="black" d="M2471.98,-1469.28C2449.43,-1419.68 2414.21,-1350.59 2378.68,-1292.6 2373.43,-1284.02 2367.97,-1275.35 2362.37,-1266.64"/>
-<polygon fill="black" stroke="black" points="2362.26,-1266.48 2355.64,-1263.62 2355.73,-1256.41 2362.35,-1259.27 2362.26,-1266.48"/>
+<title>53&#45;&gt;50</title>
+<path fill="none" stroke="black" d="M489.46,-1875.02C475.2,-1727.38 467.44,-1461.75 598.68,-1292.6 687.01,-1178.77 837.41,-1118.61 964.91,-1086.9"/>
+<polygon fill="black" stroke="black" points="965.12,-1086.85 970.01,-1081.55 976.78,-1084.01 971.9,-1089.32 965.12,-1086.85"/>
 </g>
-<!-- 54&#45;&gt;51 -->
+<!-- 54&#45;&gt;50 -->
 <g id="edge20" class="edge">
-<title>54&#45;&gt;51</title>
-<path fill="none" stroke="black" d="M1766.49,-1875.25C1759.65,-1706.15 1749.07,-1388.05 1805.68,-1292.6 1843.74,-1228.43 1906.14,-1179.32 1970.09,-1142.72"/>
-<polygon fill="black" stroke="black" points="1970.31,-1142.59 1973.59,-1136.17 1980.78,-1136.72 1977.5,-1143.15 1970.31,-1142.59"/>
+<title>54&#45;&gt;50</title>
+<path fill="none" stroke="black" d="M675.83,-1875.29C659.53,-1845.7 644.3,-1812.72 635.68,-1780 608.09,-1675.26 575.9,-1382.92 635.68,-1292.6 709.22,-1181.48 845.5,-1121.51 964.98,-1089.22"/>
+<polygon fill="black" stroke="black" points="965.25,-1089.15 970.03,-1083.75 976.86,-1086.09 972.08,-1091.49 965.25,-1089.15"/>
 </g>
-<!-- 55&#45;&gt;51 -->
+<!-- 55&#45;&gt;50 -->
 <g id="edge21" class="edge">
-<title>55&#45;&gt;51</title>
-<path fill="none" stroke="black" d="M1446.84,-1875.08C1416.04,-1727.83 1380.89,-1462.95 1507.68,-1292.6 1614.48,-1149.11 1812.17,-1090.51 1968.68,-1066.91"/>
-<polygon fill="black" stroke="black" points="1968.95,-1066.87 1974.31,-1062.04 1980.82,-1065.13 1975.46,-1069.96 1968.95,-1066.87"/>
+<title>55&#45;&gt;50</title>
+<path fill="none" stroke="black" d="M1427.94,-1858.38C1435.26,-1688.11 1436.55,-1392.6 1398.68,-1292.6 1395.43,-1284.01 1391.74,-1275.51 1387.69,-1267.1"/>
+<polygon fill="black" stroke="black" points="1387.56,-1266.83 1381.29,-1263.27 1382.16,-1256.12 1388.43,-1259.68 1387.56,-1266.83"/>
 </g>
-<!-- 56&#45;&gt;51 -->
+<!-- 56&#45;&gt;50 -->
 <g id="edge22" class="edge">
-<title>56&#45;&gt;51</title>
-<path fill="none" stroke="black" d="M2363.8,-1858.25C2374.53,-1718.16 2377.53,-1485.27 2327.68,-1292.6 2325.53,-1284.27 2323.06,-1275.9 2320.33,-1267.53"/>
-<polygon fill="black" stroke="black" points="2320.31,-1267.48 2314.59,-1263.09 2316.44,-1256.12 2322.16,-1260.52 2320.31,-1267.48"/>
+<title>56&#45;&gt;50</title>
+<path fill="none" stroke="black" d="M1734.59,-1816.39C1746.79,-1639.94 1751,-1375.7 1696.68,-1292.6 1634.67,-1197.74 1523.83,-1139.08 1421.94,-1103.46"/>
+<polygon fill="black" stroke="black" points="1421.87,-1103.44 1414.9,-1105.28 1410.52,-1099.55 1417.49,-1097.71 1421.87,-1103.44"/>
 </g>
-<!-- 57&#45;&gt;51 -->
+<!-- 57&#45;&gt;50 -->
 <g id="edge23" class="edge">
+<title>57&#45;&gt;50</title>
+<path fill="none" stroke="black" d="M774.14,-1477.86C795.79,-1425.65 829.91,-1348.46 876.68,-1292.6 903.09,-1261.05 934.44,-1231.36 967,-1204.32"/>
+<polygon fill="black" stroke="black" points="967.39,-1204 969.5,-1197.1 976.67,-1196.39 974.57,-1203.29 967.39,-1204"/>
+</g>
+<!-- 57&#45;&gt;51 -->
+<g id="edge37" class="edge">
 <title>57&#45;&gt;51</title>
-<path fill="none" stroke="black" d="M2934.12,-1816.33C2963.45,-1664.94 2976.54,-1443.02 2866.68,-1292.6 2766,-1154.75 2578.13,-1095.68 2427.04,-1070.46"/>
-<polygon fill="black" stroke="black" points="2426.69,-1070.4 2420.13,-1073.39 2414.84,-1068.49 2421.41,-1065.5 2426.69,-1070.4"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M767.57,-1594.71C787.46,-1646.73 821.7,-1723.64 867.68,-1780 915.83,-1839.01 984.16,-1891.4 1038.83,-1928.19"/>
+<polygon fill="black" stroke="black" points="1037.22,-1931.32 1047.48,-1933.95 1041.1,-1925.49 1037.22,-1931.32"/>
 </g>
-<!-- 58&#45;&gt;51 -->
+<!-- 57&#45;&gt;53 -->
+<g id="edge36" class="edge">
+<title>57&#45;&gt;53</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M715.64,-1595.12C677.78,-1663.45 613.84,-1778.87 565.51,-1866.1"/>
+<polygon fill="black" stroke="black" points="562.37,-1864.54 560.58,-1874.98 568.49,-1867.93 562.37,-1864.54"/>
+</g>
+<!-- 58&#45;&gt;50 -->
 <g id="edge24" class="edge">
-<title>58&#45;&gt;51</title>
-<path fill="none" stroke="black" d="M1952.93,-1477.63C1979.42,-1427.95 2016.81,-1354.67 2052.68,-1292.6 2057.58,-1284.13 2062.64,-1275.53 2067.79,-1266.88"/>
-<polygon fill="black" stroke="black" points="2067.96,-1266.59 2067.62,-1259.39 2074.13,-1256.3 2074.48,-1263.51 2067.96,-1266.59"/>
+<title>58&#45;&gt;50</title>
+<path fill="none" stroke="black" d="M1017.59,-1477.88C1041.45,-1425.5 1076.42,-1344.74 1108.94,-1267.56"/>
+<polygon fill="black" stroke="black" points="1109.06,-1267.27 1107.7,-1260.18 1113.72,-1256.2 1115.08,-1263.29 1109.06,-1267.27"/>
 </g>
-<!-- 58&#45;&gt;52 -->
-<g id="edge38" class="edge">
-<title>58&#45;&gt;52</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1935.84,-1595.12C1962.59,-1680.31 2012.32,-1838.66 2039.24,-1924.36"/>
-<polygon fill="black" stroke="black" points="2035.91,-1925.45 2042.24,-1933.94 2042.59,-1923.35 2035.91,-1925.45"/>
+<!-- 58&#45;&gt;51 -->
+<g id="edge39" class="edge">
+<title>58&#45;&gt;51</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1006.84,-1595.12C1033.59,-1680.31 1083.32,-1838.66 1110.24,-1924.36"/>
+<polygon fill="black" stroke="black" points="1106.91,-1925.45 1113.24,-1933.94 1113.59,-1923.35 1106.91,-1925.45"/>
 </g>
 <!-- 58&#45;&gt;54 -->
-<g id="edge37" class="edge">
+<g id="edge38" class="edge">
 <title>58&#45;&gt;54</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1898.35,-1595.12C1875.59,-1663.25 1837.17,-1778.17 1808.05,-1865.31"/>
-<polygon fill="black" stroke="black" points="1804.67,-1864.39 1804.82,-1874.98 1811.31,-1866.61 1804.67,-1864.39"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M962.13,-1595.01C938.8,-1644.72 903.27,-1718.02 868.68,-1780 852.79,-1808.47 834.73,-1838.54 817.31,-1866.58"/>
+<polygon fill="black" stroke="black" points="814.25,-1864.87 811.93,-1875.21 820.19,-1868.57 814.25,-1864.87"/>
 </g>
-<!-- 59&#45;&gt;51 -->
+<!-- 59&#45;&gt;50 -->
 <g id="edge25" class="edge">
-<title>59&#45;&gt;51</title>
-<path fill="none" stroke="black" d="M1645.25,-1477.74C1666.97,-1424.36 1702.42,-1345.41 1754.68,-1292.6 1815.33,-1231.31 1894.89,-1181.92 1969.85,-1144.2"/>
-<polygon fill="black" stroke="black" points="1970.13,-1144.06 1973.72,-1137.81 1980.87,-1138.72 1977.28,-1144.97 1970.13,-1144.06"/>
+<title>59&#45;&gt;50</title>
+<path fill="none" stroke="black" d="M1264.33,-1477.88C1257.88,-1425.72 1246.14,-1345.4 1234.01,-1268.51"/>
+<polygon fill="black" stroke="black" points="1233.93,-1268.06 1229.04,-1262.76 1232.06,-1256.2 1236.95,-1261.5 1233.93,-1268.06"/>
 </g>
-<!-- 59&#45;&gt;52 -->
-<g id="edge40" class="edge">
-<title>59&#45;&gt;52</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1648.91,-1594.7C1679.23,-1649.12 1731.34,-1729.81 1796.68,-1780 1831.83,-1807 1852.51,-1791.86 1889.68,-1816 1936.03,-1846.1 1980,-1890.63 2011.32,-1926.15"/>
-<polygon fill="black" stroke="black" points="2008.99,-1928.81 2018.2,-1934.04 2014.27,-1924.21 2008.99,-1928.81"/>
+<!-- 59&#45;&gt;51 -->
+<g id="edge41" class="edge">
+<title>59&#45;&gt;51</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1250.52,-1595.12C1223.77,-1680.31 1174.04,-1838.66 1147.13,-1924.36"/>
+<polygon fill="black" stroke="black" points="1143.78,-1923.35 1144.12,-1933.94 1150.46,-1925.45 1143.78,-1923.35"/>
 </g>
 <!-- 59&#45;&gt;55 -->
-<g id="edge39" class="edge">
+<g id="edge40" class="edge">
 <title>59&#45;&gt;55</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1600.35,-1595.12C1577.59,-1663.25 1539.17,-1778.17 1510.05,-1865.31"/>
-<polygon fill="black" stroke="black" points="1506.67,-1864.39 1506.82,-1874.98 1513.31,-1866.61 1506.67,-1864.39"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1288.01,-1595.12C1309.35,-1658.98 1344.44,-1763.96 1372.74,-1848.63"/>
+<polygon fill="black" stroke="black" points="1369.49,-1849.95 1375.98,-1858.32 1376.13,-1847.73 1369.49,-1849.95"/>
 </g>
-<!-- 60&#45;&gt;51 -->
+<!-- 60&#45;&gt;50 -->
 <g id="edge26" class="edge">
-<title>60&#45;&gt;51</title>
-<path fill="none" stroke="black" d="M2202.24,-1477.88C2203.88,-1425.72 2204.6,-1345.4 2204.4,-1268.51"/>
-<polygon fill="black" stroke="black" points="2204.4,-1268.2 2200.38,-1262.22 2204.36,-1256.2 2208.38,-1262.19 2204.4,-1268.2"/>
+<title>60&#45;&gt;50</title>
+<path fill="none" stroke="black" d="M1550.21,-1477.87C1529.77,-1426.72 1493.12,-1351.11 1449.68,-1292.6 1439.99,-1279.54 1429.57,-1266.55 1418.69,-1253.75"/>
+<polygon fill="black" stroke="black" points="1418.52,-1253.55 1411.57,-1251.62 1410.68,-1244.46 1417.63,-1246.39 1418.52,-1253.55"/>
 </g>
-<!-- 60&#45;&gt;52 -->
-<g id="edge42" class="edge">
-<title>60&#45;&gt;52</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2179.52,-1595.12C2152.77,-1680.31 2103.04,-1838.66 2076.13,-1924.36"/>
-<polygon fill="black" stroke="black" points="2072.78,-1923.35 2073.12,-1933.94 2079.46,-1925.45 2072.78,-1923.35"/>
+<!-- 60&#45;&gt;51 -->
+<g id="edge43" class="edge">
+<title>60&#45;&gt;51</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1537.45,-1594.7C1507.13,-1649.12 1455.03,-1729.81 1389.68,-1780 1354.53,-1807 1333.85,-1791.86 1296.68,-1816 1250.33,-1846.1 1206.37,-1890.63 1175.04,-1926.15"/>
+<polygon fill="black" stroke="black" points="1172.09,-1924.21 1168.16,-1934.04 1177.37,-1928.81 1172.09,-1924.21"/>
 </g>
 <!-- 60&#45;&gt;56 -->
-<g id="edge41" class="edge">
+<g id="edge42" class="edge">
 <title>60&#45;&gt;56</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2217.01,-1595.12C2238.35,-1658.98 2273.44,-1763.96 2301.74,-1848.63"/>
-<polygon fill="black" stroke="black" points="2298.49,-1849.95 2304.98,-1858.32 2305.13,-1847.73 2298.49,-1849.95"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1586.01,-1595.12C1603.94,-1648.78 1631.58,-1731.48 1656.74,-1806.75"/>
+<polygon fill="black" stroke="black" points="1653.47,-1807.99 1659.95,-1816.37 1660.1,-1805.78 1653.47,-1807.99"/>
 </g>
-<!-- 61&#45;&gt;51 -->
-<g id="edge27" class="edge">
-<title>61&#45;&gt;51</title>
-<path fill="none" stroke="black" d="M2726.08,-1477.85C2709.58,-1424.72 2675.97,-1346.12 2625.68,-1292.6 2569.88,-1233.21 2496.1,-1184.24 2425.52,-1146.32"/>
-<polygon fill="black" stroke="black" points="2425.28,-1146.2 2418.11,-1146.92 2414.68,-1140.57 2421.86,-1139.85 2425.28,-1146.2"/>
+<!-- 61&#45;&gt;62 -->
+<g id="edge45" class="edge">
+<title>61&#45;&gt;62</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2396.76,-1121.93C2395.61,-1165.16 2395,-1223.52 2394.94,-1282.75"/>
+<polygon fill="black" stroke="black" points="2391.44,-1283.04 2394.93,-1293.04 2398.44,-1283.04 2391.44,-1283.04"/>
+</g>
+<!-- 62&#45;&gt;24 -->
+<g id="edge48" class="edge">
+<title>62&#45;&gt;24</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2260.81,-1779.77C2229.29,-1834.03 2198.67,-1886.73 2176.51,-1924.88"/>
+<polygon fill="black" stroke="black" points="2173.34,-1923.36 2171.34,-1933.77 2179.39,-1926.88 2173.34,-1923.36"/>
+</g>
+<!-- 62&#45;&gt;36 -->
+<g id="edge47" class="edge">
+<title>62&#45;&gt;36</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2401.68,-1779.77C2401.68,-1844.17 2401.68,-1906.37 2401.68,-1944.66"/>
+<polygon fill="black" stroke="black" points="2398.18,-1944.8 2401.68,-1954.8 2405.18,-1944.8 2398.18,-1944.8"/>
 </g>
-<!-- 61&#45;&gt;52 -->
+<!-- 62&#45;&gt;61 -->
 <g id="edge44" class="edge">
-<title>61&#45;&gt;52</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2725.21,-1594.8C2710.54,-1651.95 2679.16,-1737.1 2616.68,-1780 2544.75,-1829.39 2304.73,-1779.05 2225.68,-1816 2173.67,-1840.31 2128.43,-1887.79 2098.04,-1925.94"/>
-<polygon fill="black" stroke="black" points="2095.2,-1923.89 2091.79,-1933.92 2100.71,-1928.21 2095.2,-1923.89"/>
+<title>62&#45;&gt;61</title>
+<path fill="none" stroke="black" d="M2408.43,-1293.04C2408.43,-1235.71 2407.92,-1178.43 2406.9,-1134.09"/>
+<polygon fill="black" stroke="black" points="2406.9,-1133.93 2402.75,-1128.03 2406.6,-1121.93 2410.75,-1127.83 2406.9,-1133.93"/>
 </g>
-<!-- 61&#45;&gt;57 -->
-<g id="edge43" class="edge">
-<title>61&#45;&gt;57</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2756.01,-1595.12C2773.94,-1648.78 2801.58,-1731.48 2826.74,-1806.75"/>
-<polygon fill="black" stroke="black" points="2823.47,-1807.99 2829.95,-1816.37 2830.1,-1805.78 2823.47,-1807.99"/>
+<!-- 63 -->
+<g id="node23" class="node">
+<title>63</title>
+<polygon fill="#f2f2f2" stroke="black" points="2525.96,-1934.1 2525.96,-2034.1 2755.41,-2034.1 2755.41,-1934.1 2525.96,-1934.1"/>
+<text text-anchor="middle" x="2640.68" y="-2017.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
+<text text-anchor="middle" x="2640.68" y="-2000.7" font-family="Times,serif" font-size="14.00">IRegistry</text>
+<text text-anchor="middle" x="2640.68" y="-1983.9" font-family="Times,serif" font-size="14.00">contracts/registries/IRegistry.sol</text>
+<polyline fill="none" stroke="black" points="2525.96,-1975.7 2755.41,-1975.7 "/>
+<text text-anchor="start" x="2533.96" y="-1959.1" font-family="Times,serif" font-size="14.00">External:</text>
+<text text-anchor="start" x="2533.96" y="-1942.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;isRegistered(_entry: address): bool</text>
 </g>
 <!-- 62&#45;&gt;63 -->
 <g id="edge46" class="edge">
 <title>62&#45;&gt;63</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M939.76,-1121.93C938.61,-1165.16 938,-1223.52 937.94,-1282.75"/>
-<polygon fill="black" stroke="black" points="934.44,-1283.04 937.93,-1293.04 941.44,-1283.04 934.44,-1283.04"/>
-</g>
-<!-- 63&#45;&gt;27 -->
-<g id="edge49" class="edge">
-<title>63&#45;&gt;27</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M803.81,-1779.77C772.29,-1834.03 741.67,-1886.73 719.51,-1924.88"/>
-<polygon fill="black" stroke="black" points="716.34,-1923.36 714.34,-1933.77 722.39,-1926.88 716.34,-1923.36"/>
-</g>
-<!-- 63&#45;&gt;37 -->
-<g id="edge48" class="edge">
-<title>63&#45;&gt;37</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M944.68,-1779.77C944.68,-1844.17 944.68,-1906.37 944.68,-1944.66"/>
-<polygon fill="black" stroke="black" points="941.18,-1944.8 944.68,-1954.8 948.18,-1944.8 941.18,-1944.8"/>
-</g>
-<!-- 63&#45;&gt;62 -->
-<g id="edge45" class="edge">
-<title>63&#45;&gt;62</title>
-<path fill="none" stroke="black" d="M951.43,-1293.04C951.43,-1235.71 950.92,-1178.43 949.9,-1134.09"/>
-<polygon fill="black" stroke="black" points="949.9,-1133.93 945.75,-1128.03 949.6,-1121.93 953.75,-1127.83 949.9,-1133.93"/>
-</g>
-<!-- 64 -->
-<g id="node23" class="node">
-<title>64</title>
-<polygon fill="#f2f2f2" stroke="black" points="1068.96,-1934.1 1068.96,-2034.1 1298.41,-2034.1 1298.41,-1934.1 1068.96,-1934.1"/>
-<text text-anchor="middle" x="1183.68" y="-2017.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
-<text text-anchor="middle" x="1183.68" y="-2000.7" font-family="Times,serif" font-size="14.00">IRegistry</text>
-<text text-anchor="middle" x="1183.68" y="-1983.9" font-family="Times,serif" font-size="14.00">contracts/registries/IRegistry.sol</text>
-<polyline fill="none" stroke="black" points="1068.96,-1975.7 1298.41,-1975.7 "/>
-<text text-anchor="start" x="1076.96" y="-1959.1" font-family="Times,serif" font-size="14.00">External:</text>
-<text text-anchor="start" x="1076.96" y="-1942.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;isRegistered(_entry: address): bool</text>
-</g>
-<!-- 63&#45;&gt;64 -->
-<g id="edge47" class="edge">
-<title>63&#45;&gt;64</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1074.67,-1779.77C1103.76,-1834.03 1132.02,-1886.73 1152.47,-1924.88"/>
-<polygon fill="black" stroke="black" points="1149.42,-1926.61 1157.23,-1933.77 1155.59,-1923.3 1149.42,-1926.61"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2531.67,-1779.77C2560.76,-1834.03 2589.02,-1886.73 2609.47,-1924.88"/>
+<polygon fill="black" stroke="black" points="2606.42,-1926.61 2614.23,-1933.77 2612.59,-1923.3 2606.42,-1926.61"/>
 </g>
 </g>
 </svg>
diff --git a/docs/uml/class-uml-IexecPocoBoostFacet.svg b/docs/uml/class-uml-IexecPocoBoostFacet.svg
index 55a6dcefd..4eefbacf7 100644
--- a/docs/uml/class-uml-IexecPocoBoostFacet.svg
+++ b/docs/uml/class-uml-IexecPocoBoostFacet.svg
@@ -4,890 +4,831 @@
 <!-- Generated by graphviz version 5.0.0 (20220707.1540)
  -->
 <!-- Title: UmlClassDiagram Pages: 1 -->
-<svg width="5684pt" height="1824pt"
- viewBox="0.00 0.00 5684.25 1824.20" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 1820.2)">
+<svg width="5311pt" height="1883pt"
+ viewBox="0.00 0.00 5311.17 1882.60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 1878.6)">
 <title>UmlClassDiagram</title>
-<polygon fill="white" stroke="transparent" points="-4,4 -4,-1820.2 5680.25,-1820.2 5680.25,4 -4,4"/>
+<polygon fill="white" stroke="transparent" points="-4,4 -4,-1878.6 5307.17,-1878.6 5307.17,4 -4,4"/>
 <!-- 3 -->
 <g id="node1" class="node">
 <title>3</title>
-<polygon fill="#f2f2f2" stroke="black" points="557.08,-560.1 557.08,-869.7 866.28,-869.7 866.28,-560.1 557.08,-560.1"/>
-<text text-anchor="middle" x="711.68" y="-853.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Abstract&gt;&gt;</text>
-<text text-anchor="middle" x="711.68" y="-836.3" font-family="Times,serif" font-size="14.00">FacetBase</text>
-<text text-anchor="middle" x="711.68" y="-819.5" font-family="Times,serif" font-size="14.00">contracts/abstract/FacetBase.sol</text>
-<polyline fill="none" stroke="black" points="557.08,-811.3 866.28,-811.3 "/>
-<text text-anchor="start" x="565.08" y="-794.7" font-family="Times,serif" font-size="14.00">Internal:</text>
-<text text-anchor="start" x="565.08" y="-777.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;CONTRIBUTION_DEADLINE_RATIO: uint256</text>
-<text text-anchor="start" x="565.08" y="-761.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;REVEAL_DEADLINE_RATIO: uint256</text>
-<text text-anchor="start" x="565.08" y="-744.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;FINAL_DEADLINE_RATIO: uint256</text>
-<text text-anchor="start" x="565.08" y="-727.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;WORKERPOOL_STAKE_RATIO: uint256</text>
-<text text-anchor="start" x="565.08" y="-710.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;KITTY_RATIO: uint256</text>
-<text text-anchor="start" x="565.08" y="-693.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;KITTY_MIN: uint256</text>
-<text text-anchor="start" x="565.08" y="-677.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;KITTY_ADDRESS: address</text>
-<text text-anchor="start" x="565.08" y="-660.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;GROUPMEMBER_PURPOSE: uint256</text>
-<polyline fill="none" stroke="black" points="557.08,-652.1 866.28,-652.1 "/>
-<text text-anchor="start" x="565.08" y="-635.5" font-family="Times,serif" font-size="14.00">Internal:</text>
-<text text-anchor="start" x="565.08" y="-618.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;owner(): address</text>
-<text text-anchor="start" x="565.08" y="-601.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_msgSender(): address</text>
-<text text-anchor="start" x="565.08" y="-585.1" font-family="Times,serif" font-size="14.00">Public:</text>
-<text text-anchor="start" x="565.08" y="-568.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;modifier&gt;&gt; onlyOwner()</text>
-</g>
-<!-- 4 -->
+<polygon fill="#f2f2f2" stroke="black" points="0,-221.5 0,-531.1 309.19,-531.1 309.19,-221.5 0,-221.5"/>
+<text text-anchor="middle" x="154.6" y="-514.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Abstract&gt;&gt;</text>
+<text text-anchor="middle" x="154.6" y="-497.7" font-family="Times,serif" font-size="14.00">FacetBase</text>
+<text text-anchor="middle" x="154.6" y="-480.9" font-family="Times,serif" font-size="14.00">contracts/abstract/FacetBase.sol</text>
+<polyline fill="none" stroke="black" points="0,-472.7 309.19,-472.7 "/>
+<text text-anchor="start" x="8" y="-456.1" font-family="Times,serif" font-size="14.00">Internal:</text>
+<text text-anchor="start" x="8" y="-439.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;CONTRIBUTION_DEADLINE_RATIO: uint256</text>
+<text text-anchor="start" x="8" y="-422.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;REVEAL_DEADLINE_RATIO: uint256</text>
+<text text-anchor="start" x="8" y="-405.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;FINAL_DEADLINE_RATIO: uint256</text>
+<text text-anchor="start" x="8" y="-388.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;WORKERPOOL_STAKE_RATIO: uint256</text>
+<text text-anchor="start" x="8" y="-372.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;KITTY_RATIO: uint256</text>
+<text text-anchor="start" x="8" y="-355.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;KITTY_MIN: uint256</text>
+<text text-anchor="start" x="8" y="-338.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;KITTY_ADDRESS: address</text>
+<text text-anchor="start" x="8" y="-321.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;GROUPMEMBER_PURPOSE: uint256</text>
+<polyline fill="none" stroke="black" points="0,-313.5 309.19,-313.5 "/>
+<text text-anchor="start" x="8" y="-296.9" font-family="Times,serif" font-size="14.00">Internal:</text>
+<text text-anchor="start" x="8" y="-280.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;owner(): address</text>
+<text text-anchor="start" x="8" y="-263.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_msgSender(): address</text>
+<text text-anchor="start" x="8" y="-246.5" font-family="Times,serif" font-size="14.00">Public:</text>
+<text text-anchor="start" x="8" y="-229.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;modifier&gt;&gt; onlyOwner()</text>
+</g>
+<!-- 67 -->
 <g id="node2" class="node">
-<title>4</title>
-<polygon fill="#f2f2f2" stroke="black" points="22.21,-255.1 22.21,-439.1 407.15,-439.1 407.15,-255.1 22.21,-255.1"/>
-<text text-anchor="middle" x="214.68" y="-422.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Abstract&gt;&gt;</text>
-<text text-anchor="middle" x="214.68" y="-405.7" font-family="Times,serif" font-size="14.00">IexecEscrow</text>
-<text text-anchor="middle" x="214.68" y="-388.9" font-family="Times,serif" font-size="14.00">contracts/abstract/IexecEscrow.sol</text>
-<polyline fill="none" stroke="black" points="22.21,-380.7 407.15,-380.7 "/>
-<text text-anchor="start" x="30.21" y="-364.1" font-family="Times,serif" font-size="14.00">Internal:</text>
-<text text-anchor="start" x="30.21" y="-347.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;lock(account: address, value: uint256)</text>
-<text text-anchor="start" x="30.21" y="-330.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;unlock(account: address, value: uint256)</text>
-<text text-anchor="start" x="30.21" y="-313.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;reward(account: address, value: uint256, ref: bytes32)</text>
-<text text-anchor="start" x="30.21" y="-296.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;seize(account: address, value: uint256, ref: bytes32)</text>
-<text text-anchor="start" x="30.21" y="-280.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;rewardAndLock(account: address, value: uint256, ref: bytes32)</text>
-<text text-anchor="start" x="30.21" y="-263.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_transfer(from: address, to: address, value: uint256)</text>
-</g>
-<!-- 4&#45;&gt;3 -->
-<g id="edge1" class="edge">
-<title>4&#45;&gt;3</title>
-<path fill="none" stroke="black" d="M354.67,-439.2C375.14,-451.22 396.22,-462.92 416.68,-473.2 455.55,-492.73 471.35,-485.29 507.68,-509.2 521.96,-518.59 536.05,-529.11 549.75,-540.29"/>
-<polygon fill="none" stroke="black" points="543.15,-548.46 572.78,-559.98 556.8,-532.5 543.15,-548.46"/>
-</g>
-<!-- 25 -->
-<g id="node7" class="node">
-<title>25</title>
-<polygon fill="#f2f2f2" stroke="black" points="0,-622.9 0,-806.9 429.36,-806.9 429.36,-622.9 0,-622.9"/>
-<text text-anchor="middle" x="214.68" y="-790.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
-<text text-anchor="middle" x="214.68" y="-773.5" font-family="Times,serif" font-size="14.00">IexecEscrowEvents</text>
-<text text-anchor="middle" x="214.68" y="-756.7" font-family="Times,serif" font-size="14.00">contracts/interfaces/IexecEscrowEvents.sol</text>
-<polyline fill="none" stroke="black" points="0,-748.5 429.36,-748.5 "/>
-<text text-anchor="start" x="8" y="-731.9" font-family="Times,serif" font-size="14.00">Public:</text>
-<text text-anchor="start" x="8" y="-715.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Transfer(from: address, to: address, value: uint256)</text>
-<text text-anchor="start" x="8" y="-698.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Approval(owner: address, spender: address, value: uint256)</text>
-<text text-anchor="start" x="8" y="-681.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Reward(owner: address, amount: uint256, ref: bytes32)</text>
-<text text-anchor="start" x="8" y="-664.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Seize(owner: address, amount: uint256, ref: bytes32)</text>
-<text text-anchor="start" x="8" y="-647.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Lock(owner: address, amount: uint256)</text>
-<text text-anchor="start" x="8" y="-631.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Unlock(owner: address, amount: uint256)</text>
-</g>
-<!-- 4&#45;&gt;25 -->
-<g id="edge2" class="edge">
-<title>4&#45;&gt;25</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M214.68,-439.46C214.68,-485.82 214.68,-542.74 214.68,-592.7"/>
-<polygon fill="none" stroke="black" points="204.18,-592.75 214.68,-622.75 225.18,-592.75 204.18,-592.75"/>
-</g>
-<!-- 62 -->
-<g id="node25" class="node">
-<title>62</title>
-<polygon fill="#f2f2f2" stroke="black" points="922.24,-644.1 922.24,-785.7 1187.13,-785.7 1187.13,-644.1 922.24,-644.1"/>
-<text text-anchor="middle" x="1054.68" y="-769.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
-<text text-anchor="middle" x="1054.68" y="-752.3" font-family="Times,serif" font-size="14.00">PocoStorageLib</text>
-<text text-anchor="middle" x="1054.68" y="-735.5" font-family="Times,serif" font-size="14.00">contracts/libs/PocoStorageLib.sol</text>
-<polyline fill="none" stroke="black" points="922.24,-727.3 1187.13,-727.3 "/>
-<text text-anchor="start" x="930.24" y="-710.7" font-family="Times,serif" font-size="14.00">Private:</text>
-<text text-anchor="start" x="930.24" y="-693.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;POCO_STORAGE_LOCATION: bytes32</text>
-<polyline fill="none" stroke="black" points="922.24,-685.7 1187.13,-685.7 "/>
-<text text-anchor="start" x="930.24" y="-669.1" font-family="Times,serif" font-size="14.00">Internal:</text>
-<text text-anchor="start" x="930.24" y="-652.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;getPocoStorage(): ($: PocoStorage)</text>
-</g>
-<!-- 4&#45;&gt;62 -->
-<g id="edge3" class="edge">
-<title>4&#45;&gt;62</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M341.67,-439.17C365.63,-452.69 391.2,-464.86 416.68,-473.2 513.92,-505.03 784.24,-463.3 875.68,-509.2 931.19,-537.07 976.92,-590.35 1008.26,-635.57"/>
-<polygon fill="black" stroke="black" points="1005.42,-637.62 1013.95,-643.92 1011.21,-633.68 1005.42,-637.62"/>
-</g>
-<!-- 63 -->
-<g id="node26" class="node">
-<title>63</title>
-<polygon fill="#f2f2f2" stroke="black" points="793.71,-957.1 793.71,-1443.5 1315.65,-1443.5 1315.65,-957.1 793.71,-957.1"/>
-<text text-anchor="middle" x="1054.68" y="-1426.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="1054.68" y="-1410.1" font-family="Times,serif" font-size="14.00">PocoStorage</text>
-<text text-anchor="middle" x="1054.68" y="-1393.3" font-family="Times,serif" font-size="14.00">contracts/libs/PocoStorageLib.sol</text>
-<polyline fill="none" stroke="black" points="793.71,-1385.1 1315.65,-1385.1 "/>
-<text text-anchor="start" x="801.71" y="-1368.5" font-family="Times,serif" font-size="14.00">m_appregistry: IRegistry</text>
-<text text-anchor="start" x="801.71" y="-1351.7" font-family="Times,serif" font-size="14.00">m_datasetregistry: IRegistry</text>
-<text text-anchor="start" x="801.71" y="-1334.9" font-family="Times,serif" font-size="14.00">m_workerpoolregistry: IRegistry</text>
-<text text-anchor="start" x="801.71" y="-1318.1" font-family="Times,serif" font-size="14.00">m_baseToken: IERC20</text>
-<text text-anchor="start" x="801.71" y="-1301.3" font-family="Times,serif" font-size="14.00">m_name: string</text>
-<text text-anchor="start" x="801.71" y="-1284.5" font-family="Times,serif" font-size="14.00">m_symbol: string</text>
-<text text-anchor="start" x="801.71" y="-1267.7" font-family="Times,serif" font-size="14.00">m_decimals: uint8</text>
-<text text-anchor="start" x="801.71" y="-1250.9" font-family="Times,serif" font-size="14.00">m_totalSupply: uint256</text>
-<text text-anchor="start" x="801.71" y="-1234.1" font-family="Times,serif" font-size="14.00">m_balances: mapping(address=&gt;uint256)</text>
-<text text-anchor="start" x="801.71" y="-1217.3" font-family="Times,serif" font-size="14.00">m_frozens: mapping(address=&gt;uint256)</text>
-<text text-anchor="start" x="801.71" y="-1200.5" font-family="Times,serif" font-size="14.00">m_allowances: mapping(address=&gt;mapping(address=&gt;uint256))</text>
-<text text-anchor="start" x="801.71" y="-1183.7" font-family="Times,serif" font-size="14.00">m_eip712DomainSeparator: bytes32</text>
-<text text-anchor="start" x="801.71" y="-1166.9" font-family="Times,serif" font-size="14.00">m_presigned: mapping(bytes32=&gt;address)</text>
-<text text-anchor="start" x="801.71" y="-1150.1" font-family="Times,serif" font-size="14.00">m_consumed: mapping(bytes32=&gt;uint256)</text>
-<text text-anchor="start" x="801.71" y="-1133.3" font-family="Times,serif" font-size="14.00">m_deals: mapping(bytes32=&gt;IexecLibCore_v5.Deal)</text>
-<text text-anchor="start" x="801.71" y="-1116.5" font-family="Times,serif" font-size="14.00">m_tasks: mapping(bytes32=&gt;IexecLibCore_v5.Task)</text>
-<text text-anchor="start" x="801.71" y="-1099.7" font-family="Times,serif" font-size="14.00">m_consensus: mapping(bytes32=&gt;IexecLibCore_v5.Consensus)</text>
-<text text-anchor="start" x="801.71" y="-1082.9" font-family="Times,serif" font-size="14.00">m_contributions: mapping(bytes32=&gt;mapping(address=&gt;IexecLibCore_v5.Contribution))</text>
-<text text-anchor="start" x="801.71" y="-1066.1" font-family="Times,serif" font-size="14.00">m_workerScores: mapping(address=&gt;uint256)</text>
-<text text-anchor="start" x="801.71" y="-1049.3" font-family="Times,serif" font-size="14.00">m_teebroker: address</text>
-<text text-anchor="start" x="801.71" y="-1032.5" font-family="Times,serif" font-size="14.00">m_callbackgas: uint256</text>
-<text text-anchor="start" x="801.71" y="-1015.7" font-family="Times,serif" font-size="14.00">m_categories: IexecLibCore_v5.Category[]</text>
-<text text-anchor="start" x="801.71" y="-998.9" font-family="Times,serif" font-size="14.00">m_v3_iexecHub: IexecHubV3Interface</text>
-<text text-anchor="start" x="801.71" y="-982.1" font-family="Times,serif" font-size="14.00">m_v3_scoreImported: mapping(address=&gt;bool)</text>
-<text text-anchor="start" x="801.71" y="-965.3" font-family="Times,serif" font-size="14.00">m_dealsBoost: mapping(bytes32=&gt;IexecLibCore_v5.DealBoost)</text>
-</g>
-<!-- 4&#45;&gt;63 -->
-<g id="edge4" class="edge">
-<title>4&#45;&gt;63</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M371.49,-439.11C396.81,-459.49 420.61,-482.97 438.68,-509.2 545.98,-664.98 431.17,-771.59 547.68,-920.6 608.63,-998.55 697.75,-1057.78 784.33,-1101.15"/>
-<polygon fill="black" stroke="black" points="783,-1104.4 793.51,-1105.7 786.1,-1098.12 783,-1104.4"/>
-</g>
-<!-- 5 -->
+<title>67</title>
+<polygon fill="#f2f2f2" stroke="black" points="327.39,-326.3 327.39,-426.3 661.81,-426.3 661.81,-326.3 327.39,-326.3"/>
+<text text-anchor="middle" x="494.6" y="-409.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
+<text text-anchor="middle" x="494.6" y="-392.9" font-family="Times,serif" font-size="14.00">IOracleConsumer</text>
+<text text-anchor="middle" x="494.6" y="-376.1" font-family="Times,serif" font-size="14.00">contracts/external/interfaces/IOracleConsumer.sol</text>
+<polyline fill="none" stroke="black" points="327.39,-367.9 661.81,-367.9 "/>
+<text text-anchor="start" x="335.39" y="-351.3" font-family="Times,serif" font-size="14.00">External:</text>
+<text text-anchor="start" x="335.39" y="-334.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;receiveResult(taskId: bytes32, resultsCallback: bytes)</text>
+</g>
+<!-- 15 -->
 <g id="node3" class="node">
-<title>5</title>
-<polygon fill="#f2f2f2" stroke="black" points="1054.1,-297.1 1054.1,-397.1 2957.26,-397.1 2957.26,-297.1 1054.1,-297.1"/>
-<text text-anchor="middle" x="2005.68" y="-380.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Abstract&gt;&gt;</text>
-<text text-anchor="middle" x="2005.68" y="-363.7" font-family="Times,serif" font-size="14.00">IexecPocoCommon</text>
-<text text-anchor="middle" x="2005.68" y="-346.9" font-family="Times,serif" font-size="14.00">contracts/abstract/IexecPocoCommon.sol</text>
-<polyline fill="none" stroke="black" points="1054.1,-338.7 2957.26,-338.7 "/>
-<text text-anchor="start" x="1062.1" y="-322.1" font-family="Times,serif" font-size="14.00">Internal:</text>
-<text text-anchor="start" x="1062.1" y="-305.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_computeDealVolume(appOrderVolume: uint256, appOrderTypedDataHash: bytes32, hasDataset: bool, datasetOrderVolume: uint256, datasetOrderTypedDataHash: bytes32, workerpoolOrderVolume: uint256, workerpoolOrderTypedDataHash: bytes32, requestOrderVolume: uint256, requestOrderTypedDataHash: bytes32): uint256</text>
-</g>
-<!-- 5&#45;&gt;3 -->
-<g id="edge5" class="edge">
-<title>5&#45;&gt;3</title>
-<path fill="none" stroke="black" d="M1452.71,-397.13C1233.09,-423.32 1009.98,-460.37 913.68,-509.2 896.38,-517.97 879.68,-528.79 863.8,-540.84"/>
-<polygon fill="none" stroke="black" points="856.96,-532.87 840.34,-559.97 870.23,-549.15 856.96,-532.87"/>
-</g>
-<!-- 51 -->
-<g id="node14" class="node">
-<title>51</title>
-<polygon fill="#f2f2f2" stroke="black" points="3920.92,-509.7 3920.92,-920.1 4354.45,-920.1 4354.45,-509.7 3920.92,-509.7"/>
-<text text-anchor="middle" x="4137.68" y="-903.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
-<text text-anchor="middle" x="4137.68" y="-886.7" font-family="Times,serif" font-size="14.00">IexecLibOrders_v5</text>
-<text text-anchor="middle" x="4137.68" y="-869.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="3920.92,-861.7 4354.45,-861.7 "/>
-<text text-anchor="start" x="3928.92" y="-845.1" font-family="Times,serif" font-size="14.00">Public:</text>
-<text text-anchor="start" x="3928.92" y="-828.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;EIP712DOMAIN_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="3928.92" y="-811.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;APPORDER_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="3928.92" y="-794.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;DATASETORDER_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="3928.92" y="-777.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;WORKERPOOLORDER_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="3928.92" y="-761.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;REQUESTORDER_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="3928.92" y="-744.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;APPORDEROPERATION_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="3928.92" y="-727.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;DATASETORDEROPERATION_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="3928.92" y="-710.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;WORKERPOOLORDEROPERATION_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="3928.92" y="-693.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;REQUESTORDEROPERATION_TYPEHASH: bytes32</text>
-<polyline fill="none" stroke="black" points="3920.92,-685.7 4354.45,-685.7 "/>
-<text text-anchor="start" x="3928.92" y="-669.1" font-family="Times,serif" font-size="14.00">Public:</text>
-<text text-anchor="start" x="3928.92" y="-652.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_domain: EIP712Domain): (domainhash: bytes32)</text>
-<text text-anchor="start" x="3928.92" y="-635.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_apporder: AppOrder): (apphash: bytes32)</text>
-<text text-anchor="start" x="3928.92" y="-618.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_datasetorder: DatasetOrder): (datasethash: bytes32)</text>
-<text text-anchor="start" x="3928.92" y="-601.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_workerpoolorder: WorkerpoolOrder): (workerpoolhash: bytes32)</text>
-<text text-anchor="start" x="3928.92" y="-585.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_requestorder: RequestOrder): (requesthash: bytes32)</text>
-<text text-anchor="start" x="3928.92" y="-568.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_apporderoperation: AppOrderOperation): bytes32</text>
-<text text-anchor="start" x="3928.92" y="-551.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_datasetorderoperation: DatasetOrderOperation): bytes32</text>
-<text text-anchor="start" x="3928.92" y="-534.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_workerpoolorderoperation: WorkerpoolOrderOperation): bytes32</text>
-<text text-anchor="start" x="3928.92" y="-517.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_requestorderoperation: RequestOrderOperation): bytes32</text>
-</g>
-<!-- 5&#45;&gt;51 -->
-<g id="edge6" class="edge">
-<title>5&#45;&gt;51</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2555.07,-397.14C2799.26,-423.26 3089.52,-460.27 3348.68,-509.2 3540.22,-545.36 3754.06,-601.87 3910.75,-646.36"/>
-<polygon fill="black" stroke="black" points="3909.94,-649.77 3920.52,-649.14 3911.85,-643.04 3909.94,-649.77"/>
-</g>
-<!-- 5&#45;&gt;62 -->
-<g id="edge7" class="edge">
-<title>5&#45;&gt;62</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1877.92,-397.24C1700.66,-465.42 1381.18,-588.31 1196.66,-659.29"/>
-<polygon fill="black" stroke="black" points="1195.24,-656.09 1187.16,-662.94 1197.75,-662.62 1195.24,-656.09"/>
-</g>
-<!-- 5&#45;&gt;63 -->
-<g id="edge8" class="edge">
-<title>5&#45;&gt;63</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1950.79,-397.23C1831.41,-504.08 1541.42,-763.64 1323.42,-958.76"/>
-<polygon fill="black" stroke="black" points="1320.82,-956.4 1315.7,-965.67 1325.49,-961.61 1320.82,-956.4"/>
-</g>
-<!-- 6 -->
-<g id="node4" class="node">
-<title>6</title>
-<polygon fill="#f2f2f2" stroke="black" points="425.31,-255.1 425.31,-439.1 998.05,-439.1 998.05,-255.1 425.31,-255.1"/>
-<text text-anchor="middle" x="711.68" y="-422.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Abstract&gt;&gt;</text>
-<text text-anchor="middle" x="711.68" y="-405.7" font-family="Times,serif" font-size="14.00">SignatureVerifier</text>
-<text text-anchor="middle" x="711.68" y="-388.9" font-family="Times,serif" font-size="14.00">contracts/abstract/SignatureVerifier.sol</text>
-<polyline fill="none" stroke="black" points="425.31,-380.7 998.05,-380.7 "/>
-<text text-anchor="start" x="433.31" y="-364.1" font-family="Times,serif" font-size="14.00">Internal:</text>
-<text text-anchor="start" x="433.31" y="-347.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_toTypedDataHash(structHash: bytes32): bytes32</text>
-<text text-anchor="start" x="433.31" y="-330.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_verifySignatureOfEthSignedMessage(account: address, message: bytes, signature: bytes): bool</text>
-<text text-anchor="start" x="433.31" y="-313.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_verifySignature(account: address, messageHash: bytes32, signature: bytes): bool</text>
-<text text-anchor="start" x="433.31" y="-296.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_verifyPresignature(account: address, messageHash: bytes32): bool</text>
-<text text-anchor="start" x="433.31" y="-280.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_verifySignatureOrPresignature(account: address, messageHash: bytes32, signature: bytes): bool</text>
-<text text-anchor="start" x="433.31" y="-263.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_isAccountAuthorizedByRestriction(restriction: address, account: address): bool</text>
-</g>
-<!-- 6&#45;&gt;3 -->
-<g id="edge9" class="edge">
-<title>6&#45;&gt;3</title>
-<path fill="none" stroke="black" d="M711.68,-439.46C711.68,-467.13 711.68,-498.55 711.68,-530.02"/>
-<polygon fill="none" stroke="black" points="701.18,-530.08 711.68,-560.08 722.18,-530.08 701.18,-530.08"/>
-</g>
-<!-- 6&#45;&gt;62 -->
-<g id="edge10" class="edge">
-<title>6&#45;&gt;62</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M833.38,-439.11C859.4,-460.85 885.88,-484.85 908.68,-509.2 944.89,-547.88 979.58,-595.89 1006.05,-635.69"/>
-<polygon fill="black" stroke="black" points="1003.15,-637.64 1011.58,-644.06 1008.99,-633.78 1003.15,-637.64"/>
+<title>15</title>
+<polygon fill="#f2f2f2" stroke="black" points="1466.51,-0.5 1466.51,-184.5 2872.69,-184.5 2872.69,-0.5 1466.51,-0.5"/>
+<text text-anchor="middle" x="2169.6" y="-167.9" font-family="Times,serif" font-size="14.00">IexecPocoBoostFacet</text>
+<text text-anchor="middle" x="2169.6" y="-151.1" font-family="Times,serif" font-size="14.00">contracts/facets/IexecPocoBoostFacet.sol</text>
+<polyline fill="none" stroke="black" points="1466.51,-142.9 2872.69,-142.9 "/>
+<text text-anchor="start" x="1474.51" y="-126.3" font-family="Times,serif" font-size="14.00">Private:</text>
+<text text-anchor="start" x="1474.51" y="-109.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_matchOrdersBoost(appOrder: IexecLibOrders_v5.AppOrder, datasetOrder: IexecLibOrders_v5.DatasetOrder, workerpoolOrder: IexecLibOrders_v5.WorkerpoolOrder, requestOrder: IexecLibOrders_v5.RequestOrder, sponsor: address): bytes32</text>
+<text text-anchor="start" x="1474.51" y="-92.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;requireTaskExistsAndUnset(taskStatus: IexecLibCore_v5.TaskStatusEnum, taskIndex: uint256, botSize: uint16)</text>
+<text text-anchor="start" x="1474.51" y="-75.9" font-family="Times,serif" font-size="14.00">External:</text>
+<text text-anchor="start" x="1474.51" y="-59.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;matchOrdersBoost(appOrder: IexecLibOrders_v5.AppOrder, datasetOrder: IexecLibOrders_v5.DatasetOrder, workerpoolOrder: IexecLibOrders_v5.WorkerpoolOrder, requestOrder: IexecLibOrders_v5.RequestOrder): bytes32</text>
+<text text-anchor="start" x="1474.51" y="-42.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;sponsorMatchOrdersBoost(appOrder: IexecLibOrders_v5.AppOrder, datasetOrder: IexecLibOrders_v5.DatasetOrder, workerpoolOrder: IexecLibOrders_v5.WorkerpoolOrder, requestOrder: IexecLibOrders_v5.RequestOrder): bytes32</text>
+<text text-anchor="start" x="1474.51" y="-25.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;pushResultBoost(dealId: bytes32, index: uint256, results: bytes, resultsCallback: bytes, authorizationSign: bytes, enclaveChallenge: address, enclaveSign: bytes)</text>
+<text text-anchor="start" x="1474.51" y="-8.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;claimBoost(dealId: bytes32, index: uint256)</text>
+</g>
+<!-- 15&#45;&gt;3 -->
+<g id="edge2" class="edge">
+<title>15&#45;&gt;3</title>
+<path fill="none" stroke="black" d="M1466.47,-119.21C1019.85,-139.17 498.05,-170.47 337.67,-215.6"/>
+<polygon fill="none" stroke="black" points="334.22,-205.68 309.26,-225.36 341.05,-225.54 334.22,-205.68"/>
 </g>
-<!-- 6&#45;&gt;63 -->
-<g id="edge11" class="edge">
-<title>6&#45;&gt;63</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M826.21,-439.24C845.76,-460.14 863.61,-483.78 875.68,-509.2 954.43,-675.08 862.89,-744.14 913.68,-920.6 916.21,-929.4 919.03,-938.26 922.07,-947.12"/>
-<polygon fill="black" stroke="black" points="918.84,-948.46 925.46,-956.73 925.44,-946.14 918.84,-948.46"/>
+<!-- 15&#45;&gt;67 -->
+<g id="edge16" class="edge">
+<title>15&#45;&gt;67</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1466.25,-112.71C1151.05,-129.61 818.45,-161.35 675.6,-221 624.19,-242.46 576.7,-284.15 543.28,-318.79"/>
+<polygon fill="black" stroke="black" points="540.71,-316.41 536.36,-326.07 545.79,-321.23 540.71,-316.41"/>
 </g>
-<!-- 68 -->
+<!-- 30 -->
 <g id="node5" class="node">
-<title>68</title>
-<polygon fill="#f2f2f2" stroke="black" points="5014.47,-297.1 5014.47,-397.1 5348.89,-397.1 5348.89,-297.1 5014.47,-297.1"/>
-<text text-anchor="middle" x="5181.68" y="-380.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
-<text text-anchor="middle" x="5181.68" y="-363.7" font-family="Times,serif" font-size="14.00">IOracleConsumer</text>
-<text text-anchor="middle" x="5181.68" y="-346.9" font-family="Times,serif" font-size="14.00">contracts/external/interfaces/IOracleConsumer.sol</text>
-<polyline fill="none" stroke="black" points="5014.47,-338.7 5348.89,-338.7 "/>
-<text text-anchor="start" x="5022.47" y="-322.1" font-family="Times,serif" font-size="14.00">External:</text>
-<text text-anchor="start" x="5022.47" y="-305.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;receiveResult(taskId: bytes32, resultsCallback: bytes)</text>
-</g>
-<!-- 18 -->
-<g id="node6" class="node">
-<title>18</title>
-<polygon fill="#f2f2f2" stroke="black" points="2358.59,-0.5 2358.59,-184.5 3764.77,-184.5 3764.77,-0.5 2358.59,-0.5"/>
-<text text-anchor="middle" x="3061.68" y="-167.9" font-family="Times,serif" font-size="14.00">IexecPocoBoostFacet</text>
-<text text-anchor="middle" x="3061.68" y="-151.1" font-family="Times,serif" font-size="14.00">contracts/facets/IexecPocoBoostFacet.sol</text>
-<polyline fill="none" stroke="black" points="2358.59,-142.9 3764.77,-142.9 "/>
-<text text-anchor="start" x="2366.59" y="-126.3" font-family="Times,serif" font-size="14.00">Private:</text>
-<text text-anchor="start" x="2366.59" y="-109.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_matchOrdersBoost(appOrder: IexecLibOrders_v5.AppOrder, datasetOrder: IexecLibOrders_v5.DatasetOrder, workerpoolOrder: IexecLibOrders_v5.WorkerpoolOrder, requestOrder: IexecLibOrders_v5.RequestOrder, sponsor: address): bytes32</text>
-<text text-anchor="start" x="2366.59" y="-92.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;requireTaskExistsAndUnset(taskStatus: IexecLibCore_v5.TaskStatusEnum, taskIndex: uint256, botSize: uint16)</text>
-<text text-anchor="start" x="2366.59" y="-75.9" font-family="Times,serif" font-size="14.00">External:</text>
-<text text-anchor="start" x="2366.59" y="-59.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;matchOrdersBoost(appOrder: IexecLibOrders_v5.AppOrder, datasetOrder: IexecLibOrders_v5.DatasetOrder, workerpoolOrder: IexecLibOrders_v5.WorkerpoolOrder, requestOrder: IexecLibOrders_v5.RequestOrder): bytes32</text>
-<text text-anchor="start" x="2366.59" y="-42.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;sponsorMatchOrdersBoost(appOrder: IexecLibOrders_v5.AppOrder, datasetOrder: IexecLibOrders_v5.DatasetOrder, workerpoolOrder: IexecLibOrders_v5.WorkerpoolOrder, requestOrder: IexecLibOrders_v5.RequestOrder): bytes32</text>
-<text text-anchor="start" x="2366.59" y="-25.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;pushResultBoost(dealId: bytes32, index: uint256, results: bytes, resultsCallback: bytes, authorizationSign: bytes, enclaveChallenge: address, enclaveSign: bytes)</text>
-<text text-anchor="start" x="2366.59" y="-8.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;claimBoost(dealId: bytes32, index: uint256)</text>
-</g>
-<!-- 18&#45;&gt;4 -->
-<g id="edge13" class="edge">
-<title>18&#45;&gt;4</title>
-<path fill="none" stroke="black" d="M2358.31,-109.23C1637.49,-128.26 597.19,-164.9 416.68,-221 400.03,-226.18 383.36,-233.06 367.15,-240.93"/>
-<polygon fill="none" stroke="black" points="362.03,-231.76 340.36,-255.01 371.8,-250.35 362.03,-231.76"/>
+<title>30</title>
+<polygon fill="#f2f2f2" stroke="black" points="793.67,-250.7 793.67,-501.9 2141.53,-501.9 2141.53,-250.7 793.67,-250.7"/>
+<text text-anchor="middle" x="1467.6" y="-485.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
+<text text-anchor="middle" x="1467.6" y="-468.5" font-family="Times,serif" font-size="14.00">IexecPocoBoost</text>
+<text text-anchor="middle" x="1467.6" y="-451.7" font-family="Times,serif" font-size="14.00">contracts/interfaces/IexecPocoBoost.sol</text>
+<polyline fill="none" stroke="black" points="793.67,-443.5 2141.53,-443.5 "/>
+<text text-anchor="start" x="801.67" y="-426.9" font-family="Times,serif" font-size="14.00">External:</text>
+<text text-anchor="start" x="801.67" y="-410.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;matchOrdersBoost(appOrder: IexecLibOrders_v5.AppOrder, datasetOrder: IexecLibOrders_v5.DatasetOrder, workerpoolOrder: IexecLibOrders_v5.WorkerpoolOrder, requestOrder: IexecLibOrders_v5.RequestOrder): bytes32</text>
+<text text-anchor="start" x="801.67" y="-393.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;sponsorMatchOrdersBoost(appOrder: IexecLibOrders_v5.AppOrder, datasetOrder: IexecLibOrders_v5.DatasetOrder, workerpoolOrder: IexecLibOrders_v5.WorkerpoolOrder, requestOrder: IexecLibOrders_v5.RequestOrder): bytes32</text>
+<text text-anchor="start" x="801.67" y="-376.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;pushResultBoost(dealId: bytes32, index: uint256, results: bytes, resultsCallback: bytes, authorizationSign: bytes, enclaveChallenge: address, enclaveSign: bytes)</text>
+<text text-anchor="start" x="801.67" y="-359.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;claimBoost(dealId: bytes32, index: uint256)</text>
+<text text-anchor="start" x="801.67" y="-342.9" font-family="Times,serif" font-size="14.00">Public:</text>
+<text text-anchor="start" x="801.67" y="-326.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; SchedulerNoticeBoost(workerpool: address, dealId: bytes32, app: address, dataset: address, category: uint256, tag: bytes32, params: string, beneficiary: address)</text>
+<text text-anchor="start" x="801.67" y="-309.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; OrdersMatched(dealid: bytes32, appHash: bytes32, datasetHash: bytes32, workerpoolHash: bytes32, requestHash: bytes32, volume: uint256)</text>
+<text text-anchor="start" x="801.67" y="-292.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; ResultPushedBoost(dealId: bytes32, index: uint256, results: bytes)</text>
+<text text-anchor="start" x="801.67" y="-275.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; TaskClaimed(taskid: bytes32)</text>
+<text text-anchor="start" x="801.67" y="-258.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; DealSponsoredBoost(dealId: bytes32, sponsor: address)</text>
+</g>
+<!-- 15&#45;&gt;30 -->
+<g id="edge1" class="edge">
+<title>15&#45;&gt;30</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1942.65,-184.6C1898.98,-202.13 1852.38,-220.84 1806.07,-239.43"/>
+<polygon fill="none" stroke="black" points="1802.02,-229.74 1778.09,-250.66 1809.84,-249.23 1802.02,-229.74"/>
 </g>
-<!-- 18&#45;&gt;5 -->
-<g id="edge15" class="edge">
-<title>18&#45;&gt;5</title>
-<path fill="none" stroke="black" d="M2681.19,-184.52C2533.67,-219.8 2369.45,-259.09 2239.87,-290.08"/>
-<polygon fill="none" stroke="black" points="2237.4,-279.88 2210.66,-297.07 2242.28,-300.3 2237.4,-279.88"/>
+<!-- 34 -->
+<g id="node6" class="node">
+<title>34</title>
+<polygon fill="#f2f2f2" stroke="black" points="2235.52,-255.1 2235.52,-497.5 4131.67,-497.5 4131.67,-255.1 2235.52,-255.1"/>
+<text text-anchor="middle" x="3183.6" y="-480.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
+<text text-anchor="middle" x="3183.6" y="-464.1" font-family="Times,serif" font-size="14.00">CommonLib</text>
+<text text-anchor="middle" x="3183.6" y="-447.3" font-family="Times,serif" font-size="14.00">contracts/libs/CommonLib.sol</text>
+<polyline fill="none" stroke="black" points="2235.52,-439.1 4131.67,-439.1 "/>
+<text text-anchor="start" x="2243.52" y="-422.5" font-family="Times,serif" font-size="14.00">Private:</text>
+<text text-anchor="start" x="2243.52" y="-405.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;GROUPMEMBER_PURPOSE: uint256</text>
+<polyline fill="none" stroke="black" points="2235.52,-397.5 4131.67,-397.5 "/>
+<text text-anchor="start" x="2243.52" y="-380.9" font-family="Times,serif" font-size="14.00">Internal:</text>
+<text text-anchor="start" x="2243.52" y="-364.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;toTypedDataHash(structHash: bytes32): bytes32</text>
+<text text-anchor="start" x="2243.52" y="-347.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;verifySignatureOfEthSignedMessage(account: address, message: bytes, signature: bytes): bool</text>
+<text text-anchor="start" x="2243.52" y="-330.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;verifySignature(account: address, messageHash: bytes32, signature: bytes): bool</text>
+<text text-anchor="start" x="2243.52" y="-313.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;verifyPresignature(account: address, messageHash: bytes32): bool</text>
+<text text-anchor="start" x="2243.52" y="-296.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;verifySignatureOrPresignature(account: address, messageHash: bytes32, signature: bytes): bool</text>
+<text text-anchor="start" x="2243.52" y="-280.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;isAccountAuthorizedByRestriction(restriction: address, account: address): bool</text>
+<text text-anchor="start" x="2243.52" y="-263.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;computeDealVolume(appOrderVolume: uint256, appOrderTypedDataHash: bytes32, hasDataset: bool, datasetOrderVolume: uint256, datasetOrderTypedDataHash: bytes32, workerpoolOrderVolume: uint256, workerpoolOrderTypedDataHash: bytes32, requestOrderVolume: uint256, requestOrderTypedDataHash: bytes32): uint256</text>
+</g>
+<!-- 15&#45;&gt;34 -->
+<g id="edge10" class="edge">
+<title>15&#45;&gt;34</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2497.06,-184.51C2574.78,-206.1 2658.96,-229.5 2740.86,-252.26"/>
+<polygon fill="black" stroke="black" points="2740.26,-255.73 2750.84,-255.03 2742.14,-248.98 2740.26,-255.73"/>
 </g>
-<!-- 18&#45;&gt;6 -->
+<!-- 35 -->
+<g id="node7" class="node">
+<title>35</title>
+<polygon fill="#f2f2f2" stroke="black" points="4187.96,-233.9 4187.96,-518.7 4593.23,-518.7 4593.23,-233.9 4187.96,-233.9"/>
+<text text-anchor="middle" x="4390.6" y="-502.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
+<text text-anchor="middle" x="4390.6" y="-485.3" font-family="Times,serif" font-size="14.00">EscrowLib</text>
+<text text-anchor="middle" x="4390.6" y="-468.5" font-family="Times,serif" font-size="14.00">contracts/libs/EscrowLib.sol</text>
+<polyline fill="none" stroke="black" points="4187.96,-460.3 4593.23,-460.3 "/>
+<text text-anchor="start" x="4195.96" y="-443.7" font-family="Times,serif" font-size="14.00">Internal:</text>
+<text text-anchor="start" x="4195.96" y="-426.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;lock(account: address, value: uint256)</text>
+<text text-anchor="start" x="4195.96" y="-410.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;unlock(account: address, value: uint256)</text>
+<text text-anchor="start" x="4195.96" y="-393.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;reward(account: address, value: uint256, ref: bytes32)</text>
+<text text-anchor="start" x="4195.96" y="-376.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;seize(account: address, value: uint256, ref: bytes32)</text>
+<text text-anchor="start" x="4195.96" y="-359.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;rewardAndLock(account: address, value: uint256, ref: bytes32)</text>
+<text text-anchor="start" x="4195.96" y="-342.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;transfer(from: address, to: address, value: uint256)</text>
+<text text-anchor="start" x="4195.96" y="-326.1" font-family="Times,serif" font-size="14.00">Public:</text>
+<text text-anchor="start" x="4195.96" y="-309.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Transfer(from: address, to: address, value: uint256)</text>
+<text text-anchor="start" x="4195.96" y="-292.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Reward(owner: address, amount: uint256, ref: bytes32)</text>
+<text text-anchor="start" x="4195.96" y="-275.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Seize(owner: address, amount: uint256, ref: bytes32)</text>
+<text text-anchor="start" x="4195.96" y="-258.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Lock(owner: address, amount: uint256)</text>
+<text text-anchor="start" x="4195.96" y="-242.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Unlock(owner: address, amount: uint256)</text>
+</g>
+<!-- 15&#45;&gt;35 -->
 <g id="edge14" class="edge">
-<title>18&#45;&gt;6</title>
-<path fill="none" stroke="black" d="M2358.29,-112.43C1868.16,-130.34 1259.52,-163.34 1011.68,-221 985.45,-227.1 958.56,-235.28 932.19,-244.55"/>
-<polygon fill="none" stroke="black" points="928.35,-234.77 903.82,-254.98 935.6,-254.48 928.35,-234.77"/>
+<title>15&#45;&gt;35</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2872.75,-119.37C3400.4,-141.96 4051.95,-177.86 4173.6,-221 4180.71,-223.52 4187.8,-226.35 4194.84,-229.44"/>
+<polygon fill="black" stroke="black" points="4193.85,-232.83 4204.4,-233.8 4196.76,-226.47 4193.85,-232.83"/>
 </g>
-<!-- 18&#45;&gt;68 -->
-<g id="edge27" class="edge">
-<title>18&#45;&gt;68</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3764.98,-100.65C4224.41,-112.78 4778.82,-143.71 5000.68,-221 5043.91,-236.06 5086.33,-264.44 5119.23,-290.36"/>
-<polygon fill="black" stroke="black" points="5117.39,-293.37 5127.38,-296.89 5121.76,-287.91 5117.39,-293.37"/>
+<!-- 36 -->
+<g id="node8" class="node">
+<title>36</title>
+<polygon fill="#f2f2f2" stroke="black" points="4677.43,-1677.3 4677.43,-1735.7 4889.76,-1735.7 4889.76,-1677.3 4677.43,-1677.3"/>
+<text text-anchor="middle" x="4783.6" y="-1719.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
+<text text-anchor="middle" x="4783.6" y="-1702.3" font-family="Times,serif" font-size="14.00">IexecLibCore_v5</text>
+<text text-anchor="middle" x="4783.6" y="-1685.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+</g>
+<!-- 15&#45;&gt;36 -->
+<g id="edge11" class="edge">
+<title>15&#45;&gt;36</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2873.01,-109.69C3622.03,-129.65 4711.05,-167.6 4789.6,-221 5026.47,-382.03 5020.65,-1231.17 4928.6,-1502.4 4906.24,-1568.28 4854.88,-1631.42 4819.7,-1669.34"/>
+<polygon fill="black" stroke="black" points="4816.75,-1667.36 4812.45,-1677.04 4821.85,-1672.16 4816.75,-1667.36"/>
 </g>
-<!-- 33 -->
+<!-- 44 -->
 <g id="node9" class="node">
-<title>33</title>
-<polygon fill="#f2f2f2" stroke="black" points="3471.75,-221.5 3471.75,-472.7 4819.61,-472.7 4819.61,-221.5 3471.75,-221.5"/>
-<text text-anchor="middle" x="4145.68" y="-456.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
-<text text-anchor="middle" x="4145.68" y="-439.3" font-family="Times,serif" font-size="14.00">IexecPocoBoost</text>
-<text text-anchor="middle" x="4145.68" y="-422.5" font-family="Times,serif" font-size="14.00">contracts/interfaces/IexecPocoBoost.sol</text>
-<polyline fill="none" stroke="black" points="3471.75,-414.3 4819.61,-414.3 "/>
-<text text-anchor="start" x="3479.75" y="-397.7" font-family="Times,serif" font-size="14.00">External:</text>
-<text text-anchor="start" x="3479.75" y="-380.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;matchOrdersBoost(appOrder: IexecLibOrders_v5.AppOrder, datasetOrder: IexecLibOrders_v5.DatasetOrder, workerpoolOrder: IexecLibOrders_v5.WorkerpoolOrder, requestOrder: IexecLibOrders_v5.RequestOrder): bytes32</text>
-<text text-anchor="start" x="3479.75" y="-364.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;sponsorMatchOrdersBoost(appOrder: IexecLibOrders_v5.AppOrder, datasetOrder: IexecLibOrders_v5.DatasetOrder, workerpoolOrder: IexecLibOrders_v5.WorkerpoolOrder, requestOrder: IexecLibOrders_v5.RequestOrder): bytes32</text>
-<text text-anchor="start" x="3479.75" y="-347.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;pushResultBoost(dealId: bytes32, index: uint256, results: bytes, resultsCallback: bytes, authorizationSign: bytes, enclaveChallenge: address, enclaveSign: bytes)</text>
-<text text-anchor="start" x="3479.75" y="-330.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;claimBoost(dealId: bytes32, index: uint256)</text>
-<text text-anchor="start" x="3479.75" y="-313.7" font-family="Times,serif" font-size="14.00">Public:</text>
-<text text-anchor="start" x="3479.75" y="-296.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; SchedulerNoticeBoost(workerpool: address, dealId: bytes32, app: address, dataset: address, category: uint256, tag: bytes32, params: string, beneficiary: address)</text>
-<text text-anchor="start" x="3479.75" y="-280.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; OrdersMatched(dealid: bytes32, appHash: bytes32, datasetHash: bytes32, workerpoolHash: bytes32, requestHash: bytes32, volume: uint256)</text>
-<text text-anchor="start" x="3479.75" y="-263.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; ResultPushedBoost(dealId: bytes32, index: uint256, results: bytes)</text>
-<text text-anchor="start" x="3479.75" y="-246.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; TaskClaimed(taskid: bytes32)</text>
-<text text-anchor="start" x="3479.75" y="-229.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; DealSponsoredBoost(dealId: bytes32, sponsor: address)</text>
-</g>
-<!-- 18&#45;&gt;33 -->
+<title>44</title>
+<polygon fill="#f2f2f2" stroke="black" points="4447.43,-1107.9 4447.43,-1409.5 4659.76,-1409.5 4659.76,-1107.9 4447.43,-1107.9"/>
+<text text-anchor="middle" x="4553.6" y="-1392.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="4553.6" y="-1376.1" font-family="Times,serif" font-size="14.00">DealBoost</text>
+<text text-anchor="middle" x="4553.6" y="-1359.3" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polyline fill="none" stroke="black" points="4447.43,-1351.1 4659.76,-1351.1 "/>
+<text text-anchor="start" x="4455.43" y="-1334.5" font-family="Times,serif" font-size="14.00">appOwner: address</text>
+<text text-anchor="start" x="4455.43" y="-1317.7" font-family="Times,serif" font-size="14.00">appPrice: uint96</text>
+<text text-anchor="start" x="4455.43" y="-1300.9" font-family="Times,serif" font-size="14.00">datasetOwner: address</text>
+<text text-anchor="start" x="4455.43" y="-1284.1" font-family="Times,serif" font-size="14.00">datasetPrice: uint96</text>
+<text text-anchor="start" x="4455.43" y="-1267.3" font-family="Times,serif" font-size="14.00">workerpoolOwner: address</text>
+<text text-anchor="start" x="4455.43" y="-1250.5" font-family="Times,serif" font-size="14.00">workerpoolPrice: uint96</text>
+<text text-anchor="start" x="4455.43" y="-1233.7" font-family="Times,serif" font-size="14.00">requester: address</text>
+<text text-anchor="start" x="4455.43" y="-1216.9" font-family="Times,serif" font-size="14.00">workerReward: uint96</text>
+<text text-anchor="start" x="4455.43" y="-1200.1" font-family="Times,serif" font-size="14.00">callback: address</text>
+<text text-anchor="start" x="4455.43" y="-1183.3" font-family="Times,serif" font-size="14.00">deadline: uint40</text>
+<text text-anchor="start" x="4455.43" y="-1166.5" font-family="Times,serif" font-size="14.00">botFirst: uint16</text>
+<text text-anchor="start" x="4455.43" y="-1149.7" font-family="Times,serif" font-size="14.00">botSize: uint16</text>
+<text text-anchor="start" x="4455.43" y="-1132.9" font-family="Times,serif" font-size="14.00">shortTag: bytes3</text>
+<text text-anchor="start" x="4455.43" y="-1116.1" font-family="Times,serif" font-size="14.00">sponsor: address</text>
+</g>
+<!-- 15&#45;&gt;44 -->
 <g id="edge12" class="edge">
-<title>18&#45;&gt;33</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3452.26,-184.52C3494.37,-194.33 3537.79,-204.45 3581.41,-214.61"/>
-<polygon fill="none" stroke="black" points="3579.26,-224.89 3610.86,-221.47 3584.02,-204.44 3579.26,-224.89"/>
-</g>
-<!-- 37 -->
-<g id="node10" class="node">
-<title>37</title>
-<polygon fill="#f2f2f2" stroke="black" points="2894.51,-1618.9 2894.51,-1677.3 3106.85,-1677.3 3106.85,-1618.9 2894.51,-1618.9"/>
-<text text-anchor="middle" x="3000.68" y="-1660.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
-<text text-anchor="middle" x="3000.68" y="-1643.9" font-family="Times,serif" font-size="14.00">IexecLibCore_v5</text>
-<text text-anchor="middle" x="3000.68" y="-1627.1" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
-</g>
-<!-- 18&#45;&gt;37 -->
-<g id="edge23" class="edge">
-<title>18&#45;&gt;37</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3054.73,-184.55C3047.03,-262.53 3031.53,-377.12 3001.68,-473.2 2931.03,-700.59 2823.32,-724.38 2770.68,-956.6 2722.8,-1167.86 2681.62,-1246.53 2770.68,-1444 2805.04,-1520.17 2883.64,-1579.25 2939.37,-1613.58"/>
-<polygon fill="black" stroke="black" points="2937.74,-1616.69 2948.11,-1618.88 2941.37,-1610.7 2937.74,-1616.69"/>
+<title>15&#45;&gt;44</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2872.72,-106.49C3577.94,-123.06 4568.31,-157.51 4628.6,-221 4687.53,-283.07 4617.92,-822.5 4577.93,-1097.68"/>
+<polygon fill="black" stroke="black" points="4574.44,-1097.36 4576.46,-1107.76 4581.36,-1098.37 4574.44,-1097.36"/>
 </g>
 <!-- 45 -->
-<g id="node11" class="node">
+<g id="node10" class="node">
 <title>45</title>
-<polygon fill="#f2f2f2" stroke="black" points="2779.51,-1049.5 2779.51,-1351.1 2991.85,-1351.1 2991.85,-1049.5 2779.51,-1049.5"/>
-<text text-anchor="middle" x="2885.68" y="-1334.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="2885.68" y="-1317.7" font-family="Times,serif" font-size="14.00">DealBoost</text>
-<text text-anchor="middle" x="2885.68" y="-1300.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
-<polyline fill="none" stroke="black" points="2779.51,-1292.7 2991.85,-1292.7 "/>
-<text text-anchor="start" x="2787.51" y="-1276.1" font-family="Times,serif" font-size="14.00">appOwner: address</text>
-<text text-anchor="start" x="2787.51" y="-1259.3" font-family="Times,serif" font-size="14.00">appPrice: uint96</text>
-<text text-anchor="start" x="2787.51" y="-1242.5" font-family="Times,serif" font-size="14.00">datasetOwner: address</text>
-<text text-anchor="start" x="2787.51" y="-1225.7" font-family="Times,serif" font-size="14.00">datasetPrice: uint96</text>
-<text text-anchor="start" x="2787.51" y="-1208.9" font-family="Times,serif" font-size="14.00">workerpoolOwner: address</text>
-<text text-anchor="start" x="2787.51" y="-1192.1" font-family="Times,serif" font-size="14.00">workerpoolPrice: uint96</text>
-<text text-anchor="start" x="2787.51" y="-1175.3" font-family="Times,serif" font-size="14.00">requester: address</text>
-<text text-anchor="start" x="2787.51" y="-1158.5" font-family="Times,serif" font-size="14.00">workerReward: uint96</text>
-<text text-anchor="start" x="2787.51" y="-1141.7" font-family="Times,serif" font-size="14.00">callback: address</text>
-<text text-anchor="start" x="2787.51" y="-1124.9" font-family="Times,serif" font-size="14.00">deadline: uint40</text>
-<text text-anchor="start" x="2787.51" y="-1108.1" font-family="Times,serif" font-size="14.00">botFirst: uint16</text>
-<text text-anchor="start" x="2787.51" y="-1091.3" font-family="Times,serif" font-size="14.00">botSize: uint16</text>
-<text text-anchor="start" x="2787.51" y="-1074.5" font-family="Times,serif" font-size="14.00">shortTag: bytes3</text>
-<text text-anchor="start" x="2787.51" y="-1057.7" font-family="Times,serif" font-size="14.00">sponsor: address</text>
-</g>
-<!-- 18&#45;&gt;45 -->
-<g id="edge24" class="edge">
-<title>18&#45;&gt;45</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3062.88,-184.72C3064.97,-385.84 3066.61,-854.76 3037.68,-920.6 3028.45,-941.61 3014.03,-937.94 3000.68,-956.6 2982.31,-982.29 2965.61,-1011.38 2950.98,-1040.27"/>
-<polygon fill="black" stroke="black" points="2947.84,-1038.72 2946.5,-1049.23 2954.1,-1041.84 2947.84,-1038.72"/>
+<polygon fill="#f2f2f2" stroke="black" points="4677.43,-1183.5 4677.43,-1333.9 4889.76,-1333.9 4889.76,-1183.5 4677.43,-1183.5"/>
+<text text-anchor="middle" x="4783.6" y="-1317.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Enum&gt;&gt;</text>
+<text text-anchor="middle" x="4783.6" y="-1300.5" font-family="Times,serif" font-size="14.00">TaskStatusEnum</text>
+<text text-anchor="middle" x="4783.6" y="-1283.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polyline fill="none" stroke="black" points="4677.43,-1275.5 4889.76,-1275.5 "/>
+<text text-anchor="start" x="4685.43" y="-1258.9" font-family="Times,serif" font-size="14.00">UNSET: 0</text>
+<text text-anchor="start" x="4685.43" y="-1242.1" font-family="Times,serif" font-size="14.00">ACTIVE: 1</text>
+<text text-anchor="start" x="4685.43" y="-1225.3" font-family="Times,serif" font-size="14.00">REVEALING: 2</text>
+<text text-anchor="start" x="4685.43" y="-1208.5" font-family="Times,serif" font-size="14.00">COMPLETED: 3</text>
+<text text-anchor="start" x="4685.43" y="-1191.7" font-family="Times,serif" font-size="14.00">FAILED: 4</text>
+</g>
+<!-- 15&#45;&gt;45 -->
+<g id="edge17" class="edge">
+<title>15&#45;&gt;45</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2872.75,-107.1C3584.65,-124.27 4589.9,-159.29 4653.6,-221 4714.29,-279.81 4703.18,-895.56 4716.6,-979 4727.22,-1045.05 4745.16,-1118.58 4759.8,-1173.52"/>
+<polygon fill="black" stroke="black" points="4756.43,-1174.46 4762.4,-1183.21 4763.19,-1172.65 4756.43,-1174.46"/>
 </g>
 <!-- 46 -->
-<g id="node12" class="node">
+<g id="node11" class="node">
 <title>46</title>
-<polygon fill="#f2f2f2" stroke="black" points="3009.51,-1125.1 3009.51,-1275.5 3221.85,-1275.5 3221.85,-1125.1 3009.51,-1125.1"/>
-<text text-anchor="middle" x="3115.68" y="-1258.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Enum&gt;&gt;</text>
-<text text-anchor="middle" x="3115.68" y="-1242.1" font-family="Times,serif" font-size="14.00">TaskStatusEnum</text>
-<text text-anchor="middle" x="3115.68" y="-1225.3" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
-<polyline fill="none" stroke="black" points="3009.51,-1217.1 3221.85,-1217.1 "/>
-<text text-anchor="start" x="3017.51" y="-1200.5" font-family="Times,serif" font-size="14.00">UNSET: 0</text>
-<text text-anchor="start" x="3017.51" y="-1183.7" font-family="Times,serif" font-size="14.00">ACTIVE: 1</text>
-<text text-anchor="start" x="3017.51" y="-1166.9" font-family="Times,serif" font-size="14.00">REVEALING: 2</text>
-<text text-anchor="start" x="3017.51" y="-1150.1" font-family="Times,serif" font-size="14.00">COMPLETED: 3</text>
-<text text-anchor="start" x="3017.51" y="-1133.3" font-family="Times,serif" font-size="14.00">FAILED: 4</text>
-</g>
-<!-- 18&#45;&gt;46 -->
-<g id="edge28" class="edge">
-<title>18&#45;&gt;46</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3072.46,-184.67C3073.68,-196.87 3074.8,-209.23 3075.68,-221 3100.53,-551.15 3110.72,-945.22 3114.18,-1114.84"/>
-<polygon fill="black" stroke="black" points="3110.68,-1115.02 3114.38,-1124.95 3117.68,-1114.88 3110.68,-1115.02"/>
+<polygon fill="#f2f2f2" stroke="black" points="4725.43,-614.1 4725.43,-932.5 4937.76,-932.5 4937.76,-614.1 4725.43,-614.1"/>
+<text text-anchor="middle" x="4831.6" y="-915.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="4831.6" y="-899.1" font-family="Times,serif" font-size="14.00">Task</text>
+<text text-anchor="middle" x="4831.6" y="-882.3" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polyline fill="none" stroke="black" points="4725.43,-874.1 4937.76,-874.1 "/>
+<text text-anchor="start" x="4733.43" y="-857.5" font-family="Times,serif" font-size="14.00">status: TaskStatusEnum</text>
+<text text-anchor="start" x="4733.43" y="-840.7" font-family="Times,serif" font-size="14.00">dealid: bytes32</text>
+<text text-anchor="start" x="4733.43" y="-823.9" font-family="Times,serif" font-size="14.00">idx: uint256</text>
+<text text-anchor="start" x="4733.43" y="-807.1" font-family="Times,serif" font-size="14.00">timeref: uint256</text>
+<text text-anchor="start" x="4733.43" y="-790.3" font-family="Times,serif" font-size="14.00">contributionDeadline: uint256</text>
+<text text-anchor="start" x="4733.43" y="-773.5" font-family="Times,serif" font-size="14.00">revealDeadline: uint256</text>
+<text text-anchor="start" x="4733.43" y="-756.7" font-family="Times,serif" font-size="14.00">finalDeadline: uint256</text>
+<text text-anchor="start" x="4733.43" y="-739.9" font-family="Times,serif" font-size="14.00">consensusValue: bytes32</text>
+<text text-anchor="start" x="4733.43" y="-723.1" font-family="Times,serif" font-size="14.00">revealCounter: uint256</text>
+<text text-anchor="start" x="4733.43" y="-706.3" font-family="Times,serif" font-size="14.00">winnerCounter: uint256</text>
+<text text-anchor="start" x="4733.43" y="-689.5" font-family="Times,serif" font-size="14.00">contributors: address[]</text>
+<text text-anchor="start" x="4733.43" y="-672.7" font-family="Times,serif" font-size="14.00">resultDigest: bytes32</text>
+<text text-anchor="start" x="4733.43" y="-655.9" font-family="Times,serif" font-size="14.00">results: bytes</text>
+<text text-anchor="start" x="4733.43" y="-639.1" font-family="Times,serif" font-size="14.00">resultsTimestamp: uint256</text>
+<text text-anchor="start" x="4733.43" y="-622.3" font-family="Times,serif" font-size="14.00">resultsCallback: bytes</text>
+</g>
+<!-- 15&#45;&gt;46 -->
+<g id="edge15" class="edge">
+<title>15&#45;&gt;46</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2872.72,-107.89C3600.68,-125.94 4641.9,-161.9 4711.6,-221 4820.16,-313.06 4844.14,-478.24 4844.58,-603.87"/>
+<polygon fill="black" stroke="black" points="4841.08,-603.98 4844.57,-613.98 4848.08,-603.99 4841.08,-603.98"/>
 </g>
-<!-- 47 -->
-<g id="node13" class="node">
-<title>47</title>
-<polygon fill="#f2f2f2" stroke="black" points="3127.51,-555.7 3127.51,-874.1 3339.85,-874.1 3339.85,-555.7 3127.51,-555.7"/>
-<text text-anchor="middle" x="3233.68" y="-857.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="3233.68" y="-840.7" font-family="Times,serif" font-size="14.00">Task</text>
-<text text-anchor="middle" x="3233.68" y="-823.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
-<polyline fill="none" stroke="black" points="3127.51,-815.7 3339.85,-815.7 "/>
-<text text-anchor="start" x="3135.51" y="-799.1" font-family="Times,serif" font-size="14.00">status: TaskStatusEnum</text>
-<text text-anchor="start" x="3135.51" y="-782.3" font-family="Times,serif" font-size="14.00">dealid: bytes32</text>
-<text text-anchor="start" x="3135.51" y="-765.5" font-family="Times,serif" font-size="14.00">idx: uint256</text>
-<text text-anchor="start" x="3135.51" y="-748.7" font-family="Times,serif" font-size="14.00">timeref: uint256</text>
-<text text-anchor="start" x="3135.51" y="-731.9" font-family="Times,serif" font-size="14.00">contributionDeadline: uint256</text>
-<text text-anchor="start" x="3135.51" y="-715.1" font-family="Times,serif" font-size="14.00">revealDeadline: uint256</text>
-<text text-anchor="start" x="3135.51" y="-698.3" font-family="Times,serif" font-size="14.00">finalDeadline: uint256</text>
-<text text-anchor="start" x="3135.51" y="-681.5" font-family="Times,serif" font-size="14.00">consensusValue: bytes32</text>
-<text text-anchor="start" x="3135.51" y="-664.7" font-family="Times,serif" font-size="14.00">revealCounter: uint256</text>
-<text text-anchor="start" x="3135.51" y="-647.9" font-family="Times,serif" font-size="14.00">winnerCounter: uint256</text>
-<text text-anchor="start" x="3135.51" y="-631.1" font-family="Times,serif" font-size="14.00">contributors: address[]</text>
-<text text-anchor="start" x="3135.51" y="-614.3" font-family="Times,serif" font-size="14.00">resultDigest: bytes32</text>
-<text text-anchor="start" x="3135.51" y="-597.5" font-family="Times,serif" font-size="14.00">results: bytes</text>
-<text text-anchor="start" x="3135.51" y="-580.7" font-family="Times,serif" font-size="14.00">resultsTimestamp: uint256</text>
-<text text-anchor="start" x="3135.51" y="-563.9" font-family="Times,serif" font-size="14.00">resultsCallback: bytes</text>
-</g>
-<!-- 18&#45;&gt;47 -->
-<g id="edge26" class="edge">
-<title>18&#45;&gt;47</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3100.82,-184.82C3105.43,-196.89 3109.85,-209.17 3113.68,-221 3148.13,-327.43 3177.93,-449.58 3199.22,-545.66"/>
-<polygon fill="black" stroke="black" points="3195.81,-546.45 3201.39,-555.46 3202.65,-544.94 3195.81,-546.45"/>
+<!-- 50 -->
+<g id="node12" class="node">
+<title>50</title>
+<polygon fill="#f2f2f2" stroke="black" points="1157.83,-568.1 1157.83,-978.5 1591.36,-978.5 1591.36,-568.1 1157.83,-568.1"/>
+<text text-anchor="middle" x="1374.6" y="-961.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
+<text text-anchor="middle" x="1374.6" y="-945.1" font-family="Times,serif" font-size="14.00">IexecLibOrders_v5</text>
+<text text-anchor="middle" x="1374.6" y="-928.3" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="1157.83,-920.1 1591.36,-920.1 "/>
+<text text-anchor="start" x="1165.83" y="-903.5" font-family="Times,serif" font-size="14.00">Public:</text>
+<text text-anchor="start" x="1165.83" y="-886.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;EIP712DOMAIN_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="1165.83" y="-869.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;APPORDER_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="1165.83" y="-853.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;DATASETORDER_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="1165.83" y="-836.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;WORKERPOOLORDER_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="1165.83" y="-819.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;REQUESTORDER_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="1165.83" y="-802.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;APPORDEROPERATION_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="1165.83" y="-785.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;DATASETORDEROPERATION_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="1165.83" y="-769.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;WORKERPOOLORDEROPERATION_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="1165.83" y="-752.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;REQUESTORDEROPERATION_TYPEHASH: bytes32</text>
+<polyline fill="none" stroke="black" points="1157.83,-744.1 1591.36,-744.1 "/>
+<text text-anchor="start" x="1165.83" y="-727.5" font-family="Times,serif" font-size="14.00">Public:</text>
+<text text-anchor="start" x="1165.83" y="-710.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_domain: EIP712Domain): (domainhash: bytes32)</text>
+<text text-anchor="start" x="1165.83" y="-693.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_apporder: AppOrder): (apphash: bytes32)</text>
+<text text-anchor="start" x="1165.83" y="-677.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_datasetorder: DatasetOrder): (datasethash: bytes32)</text>
+<text text-anchor="start" x="1165.83" y="-660.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_workerpoolorder: WorkerpoolOrder): (workerpoolhash: bytes32)</text>
+<text text-anchor="start" x="1165.83" y="-643.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_requestorder: RequestOrder): (requesthash: bytes32)</text>
+<text text-anchor="start" x="1165.83" y="-626.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_apporderoperation: AppOrderOperation): bytes32</text>
+<text text-anchor="start" x="1165.83" y="-609.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_datasetorderoperation: DatasetOrderOperation): bytes32</text>
+<text text-anchor="start" x="1165.83" y="-593.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_workerpoolorderoperation: WorkerpoolOrderOperation): bytes32</text>
+<text text-anchor="start" x="1165.83" y="-576.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_requestorderoperation: RequestOrderOperation): bytes32</text>
+</g>
+<!-- 15&#45;&gt;50 -->
+<g id="edge3" class="edge">
+<title>15&#45;&gt;50</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1466.36,-115.25C1136.09,-132.91 803.18,-164.57 751.6,-221 705.03,-271.94 712.56,-474.67 751.6,-531.6 840.05,-660.59 1008.25,-720.48 1147.6,-748.27"/>
+<polygon fill="black" stroke="black" points="1147.1,-751.74 1157.59,-750.21 1148.44,-744.87 1147.1,-751.74"/>
 </g>
-<!-- 18&#45;&gt;51 -->
-<g id="edge16" class="edge">
-<title>18&#45;&gt;51</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3381.46,-184.61C3395.44,-195.41 3408.33,-207.49 3419.68,-221 3492.83,-308.06 3389.55,-386.13 3462.68,-473.2 3463.17,-473.78 3715.12,-563.54 3911.03,-633.26"/>
-<polygon fill="black" stroke="black" points="3910.01,-636.62 3920.61,-636.67 3912.36,-630.02 3910.01,-636.62"/>
+<!-- 53 -->
+<g id="node15" class="node">
+<title>53</title>
+<polygon fill="#f2f2f2" stroke="black" points="1560.99,-1597.7 1560.99,-1815.3 1784.21,-1815.3 1784.21,-1597.7 1560.99,-1597.7"/>
+<text text-anchor="middle" x="1672.6" y="-1798.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="1672.6" y="-1781.9" font-family="Times,serif" font-size="14.00">AppOrder</text>
+<text text-anchor="middle" x="1672.6" y="-1765.1" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="1560.99,-1756.9 1784.21,-1756.9 "/>
+<text text-anchor="start" x="1568.99" y="-1740.3" font-family="Times,serif" font-size="14.00">app: address</text>
+<text text-anchor="start" x="1568.99" y="-1723.5" font-family="Times,serif" font-size="14.00">appprice: uint256</text>
+<text text-anchor="start" x="1568.99" y="-1706.7" font-family="Times,serif" font-size="14.00">volume: uint256</text>
+<text text-anchor="start" x="1568.99" y="-1689.9" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
+<text text-anchor="start" x="1568.99" y="-1673.1" font-family="Times,serif" font-size="14.00">datasetrestrict: address</text>
+<text text-anchor="start" x="1568.99" y="-1656.3" font-family="Times,serif" font-size="14.00">workerpoolrestrict: address</text>
+<text text-anchor="start" x="1568.99" y="-1639.5" font-family="Times,serif" font-size="14.00">requesterrestrict: address</text>
+<text text-anchor="start" x="1568.99" y="-1622.7" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
+<text text-anchor="start" x="1568.99" y="-1605.9" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+</g>
+<!-- 15&#45;&gt;53 -->
+<g id="edge4" class="edge">
+<title>15&#45;&gt;53</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2169.05,-184.58C2166.44,-480.93 2151.26,-1404.28 2063.6,-1502.4 2010.4,-1561.94 1960.13,-1505.03 1887.6,-1538.4 1854.52,-1553.62 1821.89,-1574.8 1792.43,-1596.98"/>
+<polygon fill="black" stroke="black" points="1790.03,-1594.41 1784.21,-1603.26 1794.28,-1599.98 1790.03,-1594.41"/>
 </g>
 <!-- 54 -->
-<g id="node17" class="node">
+<g id="node16" class="node">
 <title>54</title>
-<polygon fill="#f2f2f2" stroke="black" points="3503.07,-1539.3 3503.07,-1756.9 3726.29,-1756.9 3726.29,-1539.3 3503.07,-1539.3"/>
-<text text-anchor="middle" x="3614.68" y="-1740.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="3614.68" y="-1723.5" font-family="Times,serif" font-size="14.00">AppOrder</text>
-<text text-anchor="middle" x="3614.68" y="-1706.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="3503.07,-1698.5 3726.29,-1698.5 "/>
-<text text-anchor="start" x="3511.07" y="-1681.9" font-family="Times,serif" font-size="14.00">app: address</text>
-<text text-anchor="start" x="3511.07" y="-1665.1" font-family="Times,serif" font-size="14.00">appprice: uint256</text>
-<text text-anchor="start" x="3511.07" y="-1648.3" font-family="Times,serif" font-size="14.00">volume: uint256</text>
-<text text-anchor="start" x="3511.07" y="-1631.5" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
-<text text-anchor="start" x="3511.07" y="-1614.7" font-family="Times,serif" font-size="14.00">datasetrestrict: address</text>
-<text text-anchor="start" x="3511.07" y="-1597.9" font-family="Times,serif" font-size="14.00">workerpoolrestrict: address</text>
-<text text-anchor="start" x="3511.07" y="-1581.1" font-family="Times,serif" font-size="14.00">requesterrestrict: address</text>
-<text text-anchor="start" x="3511.07" y="-1564.3" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
-<text text-anchor="start" x="3511.07" y="-1547.5" font-family="Times,serif" font-size="14.00">sign: bytes</text>
-</g>
-<!-- 18&#45;&gt;54 -->
-<g id="edge17" class="edge">
-<title>18&#45;&gt;54</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3150.32,-184.62C3220.02,-263.27 3311.38,-383.74 3348.68,-509.2 3374.74,-596.83 3386.88,-837.54 3348.68,-920.6 3338.41,-942.94 3316.95,-934.26 3306.68,-956.6 3261.42,-1055 3255.33,-1348.63 3306.68,-1444 3346.28,-1517.54 3425.44,-1568.86 3493.6,-1601.51"/>
-<polygon fill="black" stroke="black" points="3492.17,-1604.7 3502.71,-1605.79 3495.15,-1598.37 3492.17,-1604.7"/>
+<polygon fill="#f2f2f2" stroke="black" points="1896.99,-1597.7 1896.99,-1815.3 2120.21,-1815.3 2120.21,-1597.7 1896.99,-1597.7"/>
+<text text-anchor="middle" x="2008.6" y="-1798.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="2008.6" y="-1781.9" font-family="Times,serif" font-size="14.00">DatasetOrder</text>
+<text text-anchor="middle" x="2008.6" y="-1765.1" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="1896.99,-1756.9 2120.21,-1756.9 "/>
+<text text-anchor="start" x="1904.99" y="-1740.3" font-family="Times,serif" font-size="14.00">dataset: address</text>
+<text text-anchor="start" x="1904.99" y="-1723.5" font-family="Times,serif" font-size="14.00">datasetprice: uint256</text>
+<text text-anchor="start" x="1904.99" y="-1706.7" font-family="Times,serif" font-size="14.00">volume: uint256</text>
+<text text-anchor="start" x="1904.99" y="-1689.9" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
+<text text-anchor="start" x="1904.99" y="-1673.1" font-family="Times,serif" font-size="14.00">apprestrict: address</text>
+<text text-anchor="start" x="1904.99" y="-1656.3" font-family="Times,serif" font-size="14.00">workerpoolrestrict: address</text>
+<text text-anchor="start" x="1904.99" y="-1639.5" font-family="Times,serif" font-size="14.00">requesterrestrict: address</text>
+<text text-anchor="start" x="1904.99" y="-1622.7" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
+<text text-anchor="start" x="1904.99" y="-1605.9" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+</g>
+<!-- 15&#45;&gt;54 -->
+<g id="edge5" class="edge">
+<title>15&#45;&gt;54</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2180.83,-184.64C2181.97,-196.85 2182.95,-209.22 2183.6,-221 2191.14,-358.84 2188.49,-393.64 2183.6,-531.6 2168.25,-963.88 2232.47,-1086.21 2114.6,-1502.4 2106.39,-1531.37 2093.77,-1560.96 2080.07,-1588.28"/>
+<polygon fill="black" stroke="black" points="2076.81,-1586.95 2075.38,-1597.45 2083.05,-1590.14 2076.81,-1586.95"/>
 </g>
 <!-- 55 -->
-<g id="node18" class="node">
+<g id="node17" class="node">
 <title>55</title>
-<polygon fill="#f2f2f2" stroke="black" points="3877.07,-1539.3 3877.07,-1756.9 4100.29,-1756.9 4100.29,-1539.3 3877.07,-1539.3"/>
-<text text-anchor="middle" x="3988.68" y="-1740.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="3988.68" y="-1723.5" font-family="Times,serif" font-size="14.00">DatasetOrder</text>
-<text text-anchor="middle" x="3988.68" y="-1706.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="3877.07,-1698.5 4100.29,-1698.5 "/>
-<text text-anchor="start" x="3885.07" y="-1681.9" font-family="Times,serif" font-size="14.00">dataset: address</text>
-<text text-anchor="start" x="3885.07" y="-1665.1" font-family="Times,serif" font-size="14.00">datasetprice: uint256</text>
-<text text-anchor="start" x="3885.07" y="-1648.3" font-family="Times,serif" font-size="14.00">volume: uint256</text>
-<text text-anchor="start" x="3885.07" y="-1631.5" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
-<text text-anchor="start" x="3885.07" y="-1614.7" font-family="Times,serif" font-size="14.00">apprestrict: address</text>
-<text text-anchor="start" x="3885.07" y="-1597.9" font-family="Times,serif" font-size="14.00">workerpoolrestrict: address</text>
-<text text-anchor="start" x="3885.07" y="-1581.1" font-family="Times,serif" font-size="14.00">requesterrestrict: address</text>
-<text text-anchor="start" x="3885.07" y="-1564.3" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
-<text text-anchor="start" x="3885.07" y="-1547.5" font-family="Times,serif" font-size="14.00">sign: bytes</text>
-</g>
-<!-- 18&#45;&gt;55 -->
-<g id="edge18" class="edge">
-<title>18&#45;&gt;55</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3234.34,-184.62C3248.26,-195.78 3261.31,-207.92 3272.68,-221 3389.25,-355.17 3533.66,-786.96 3586.68,-956.6 3652.64,-1167.67 3563.55,-1260.32 3686.68,-1444 3689.85,-1448.73 3785.4,-1512.66 3868.17,-1567.54"/>
-<polygon fill="black" stroke="black" points="3866.38,-1570.55 3876.65,-1573.16 3870.25,-1564.72 3866.38,-1570.55"/>
+<polygon fill="#f2f2f2" stroke="black" points="1262.99,-1580.9 1262.99,-1832.1 1486.21,-1832.1 1486.21,-1580.9 1262.99,-1580.9"/>
+<text text-anchor="middle" x="1374.6" y="-1815.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="1374.6" y="-1798.7" font-family="Times,serif" font-size="14.00">WorkerpoolOrder</text>
+<text text-anchor="middle" x="1374.6" y="-1781.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="1262.99,-1773.7 1486.21,-1773.7 "/>
+<text text-anchor="start" x="1270.99" y="-1757.1" font-family="Times,serif" font-size="14.00">workerpool: address</text>
+<text text-anchor="start" x="1270.99" y="-1740.3" font-family="Times,serif" font-size="14.00">workerpoolprice: uint256</text>
+<text text-anchor="start" x="1270.99" y="-1723.5" font-family="Times,serif" font-size="14.00">volume: uint256</text>
+<text text-anchor="start" x="1270.99" y="-1706.7" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
+<text text-anchor="start" x="1270.99" y="-1689.9" font-family="Times,serif" font-size="14.00">category: uint256</text>
+<text text-anchor="start" x="1270.99" y="-1673.1" font-family="Times,serif" font-size="14.00">trust: uint256</text>
+<text text-anchor="start" x="1270.99" y="-1656.3" font-family="Times,serif" font-size="14.00">apprestrict: address</text>
+<text text-anchor="start" x="1270.99" y="-1639.5" font-family="Times,serif" font-size="14.00">datasetrestrict: address</text>
+<text text-anchor="start" x="1270.99" y="-1622.7" font-family="Times,serif" font-size="14.00">requesterrestrict: address</text>
+<text text-anchor="start" x="1270.99" y="-1605.9" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
+<text text-anchor="start" x="1270.99" y="-1589.1" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+</g>
+<!-- 15&#45;&gt;55 -->
+<g id="edge6" class="edge">
+<title>15&#45;&gt;55</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1466.3,-117.17C1149.16,-135.28 834.08,-166.76 784.6,-221 761.34,-246.5 760.74,-506.66 784.6,-531.6 847.34,-597.17 1524.55,-518.07 1600.6,-567.6 1771.61,-678.98 1646.26,-850.22 1804.6,-979 1853.77,-1019 1903.84,-964.84 1942.6,-1015 1975.71,-1057.86 1979.09,-1462.39 1942.6,-1502.4 1883.79,-1566.87 1631.12,-1502.48 1551.6,-1538.4 1531.22,-1547.6 1511.71,-1560.14 1493.58,-1574.23"/>
+<polygon fill="black" stroke="black" points="1490.97,-1571.83 1485.34,-1580.81 1495.34,-1577.3 1490.97,-1571.83"/>
 </g>
 <!-- 56 -->
-<g id="node19" class="node">
+<g id="node18" class="node">
 <title>56</title>
-<polygon fill="#f2f2f2" stroke="black" points="4653.07,-1522.5 4653.07,-1773.7 4876.29,-1773.7 4876.29,-1522.5 4653.07,-1522.5"/>
-<text text-anchor="middle" x="4764.68" y="-1757.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="4764.68" y="-1740.3" font-family="Times,serif" font-size="14.00">WorkerpoolOrder</text>
-<text text-anchor="middle" x="4764.68" y="-1723.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="4653.07,-1715.3 4876.29,-1715.3 "/>
-<text text-anchor="start" x="4661.07" y="-1698.7" font-family="Times,serif" font-size="14.00">workerpool: address</text>
-<text text-anchor="start" x="4661.07" y="-1681.9" font-family="Times,serif" font-size="14.00">workerpoolprice: uint256</text>
-<text text-anchor="start" x="4661.07" y="-1665.1" font-family="Times,serif" font-size="14.00">volume: uint256</text>
-<text text-anchor="start" x="4661.07" y="-1648.3" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
-<text text-anchor="start" x="4661.07" y="-1631.5" font-family="Times,serif" font-size="14.00">category: uint256</text>
-<text text-anchor="start" x="4661.07" y="-1614.7" font-family="Times,serif" font-size="14.00">trust: uint256</text>
-<text text-anchor="start" x="4661.07" y="-1597.9" font-family="Times,serif" font-size="14.00">apprestrict: address</text>
-<text text-anchor="start" x="4661.07" y="-1581.1" font-family="Times,serif" font-size="14.00">datasetrestrict: address</text>
-<text text-anchor="start" x="4661.07" y="-1564.3" font-family="Times,serif" font-size="14.00">requesterrestrict: address</text>
-<text text-anchor="start" x="4661.07" y="-1547.5" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
-<text text-anchor="start" x="4661.07" y="-1530.7" font-family="Times,serif" font-size="14.00">sign: bytes</text>
-</g>
-<!-- 18&#45;&gt;56 -->
+<polygon fill="#f2f2f2" stroke="black" points="443.99,-1538.9 443.99,-1874.1 667.21,-1874.1 667.21,-1538.9 443.99,-1538.9"/>
+<text text-anchor="middle" x="555.6" y="-1857.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="555.6" y="-1840.7" font-family="Times,serif" font-size="14.00">RequestOrder</text>
+<text text-anchor="middle" x="555.6" y="-1823.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="443.99,-1815.7 667.21,-1815.7 "/>
+<text text-anchor="start" x="451.99" y="-1799.1" font-family="Times,serif" font-size="14.00">app: address</text>
+<text text-anchor="start" x="451.99" y="-1782.3" font-family="Times,serif" font-size="14.00">appmaxprice: uint256</text>
+<text text-anchor="start" x="451.99" y="-1765.5" font-family="Times,serif" font-size="14.00">dataset: address</text>
+<text text-anchor="start" x="451.99" y="-1748.7" font-family="Times,serif" font-size="14.00">datasetmaxprice: uint256</text>
+<text text-anchor="start" x="451.99" y="-1731.9" font-family="Times,serif" font-size="14.00">workerpool: address</text>
+<text text-anchor="start" x="451.99" y="-1715.1" font-family="Times,serif" font-size="14.00">workerpoolmaxprice: uint256</text>
+<text text-anchor="start" x="451.99" y="-1698.3" font-family="Times,serif" font-size="14.00">requester: address</text>
+<text text-anchor="start" x="451.99" y="-1681.5" font-family="Times,serif" font-size="14.00">volume: uint256</text>
+<text text-anchor="start" x="451.99" y="-1664.7" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
+<text text-anchor="start" x="451.99" y="-1647.9" font-family="Times,serif" font-size="14.00">category: uint256</text>
+<text text-anchor="start" x="451.99" y="-1631.1" font-family="Times,serif" font-size="14.00">trust: uint256</text>
+<text text-anchor="start" x="451.99" y="-1614.3" font-family="Times,serif" font-size="14.00">beneficiary: address</text>
+<text text-anchor="start" x="451.99" y="-1597.5" font-family="Times,serif" font-size="14.00">callback: address</text>
+<text text-anchor="start" x="451.99" y="-1580.7" font-family="Times,serif" font-size="14.00">params: string</text>
+<text text-anchor="start" x="451.99" y="-1563.9" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
+<text text-anchor="start" x="451.99" y="-1547.1" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+</g>
+<!-- 15&#45;&gt;56 -->
+<g id="edge7" class="edge">
+<title>15&#45;&gt;56</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1466.35,-116.54C1123.95,-134.68 773.38,-166.39 715.6,-221 614.22,-316.81 762.16,-426.37 670.6,-531.6 632.93,-574.89 583.36,-523.54 546.6,-567.6 280.1,-886.99 445.75,-1090.06 500.6,-1502.4 501.75,-1511.08 503.17,-1519.92 504.8,-1528.81"/>
+<polygon fill="black" stroke="black" points="501.41,-1529.69 506.72,-1538.86 508.28,-1528.38 501.41,-1529.69"/>
+</g>
+<!-- 61 -->
+<g id="node23" class="node">
+<title>61</title>
+<polygon fill="#f2f2f2" stroke="black" points="4036.15,-702.5 4036.15,-844.1 4301.04,-844.1 4301.04,-702.5 4036.15,-702.5"/>
+<text text-anchor="middle" x="4168.6" y="-827.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
+<text text-anchor="middle" x="4168.6" y="-810.7" font-family="Times,serif" font-size="14.00">PocoStorageLib</text>
+<text text-anchor="middle" x="4168.6" y="-793.9" font-family="Times,serif" font-size="14.00">contracts/libs/PocoStorageLib.sol</text>
+<polyline fill="none" stroke="black" points="4036.15,-785.7 4301.04,-785.7 "/>
+<text text-anchor="start" x="4044.15" y="-769.1" font-family="Times,serif" font-size="14.00">Private:</text>
+<text text-anchor="start" x="4044.15" y="-752.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;POCO_STORAGE_LOCATION: bytes32</text>
+<polyline fill="none" stroke="black" points="4036.15,-744.1 4301.04,-744.1 "/>
+<text text-anchor="start" x="4044.15" y="-727.5" font-family="Times,serif" font-size="14.00">Internal:</text>
+<text text-anchor="start" x="4044.15" y="-710.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;getPocoStorage(): ($: PocoStorage)</text>
+</g>
+<!-- 15&#45;&gt;61 -->
+<g id="edge8" class="edge">
+<title>15&#45;&gt;61</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2872.8,-117.13C3420.38,-138.99 4095.24,-175.01 4140.6,-221 4172.88,-253.73 4172.5,-547.16 4170.28,-692.06"/>
+<polygon fill="black" stroke="black" points="4166.78,-692.18 4170.12,-702.23 4173.78,-692.29 4166.78,-692.18"/>
+</g>
+<!-- 62 -->
+<g id="node24" class="node">
+<title>62</title>
+<polygon fill="#f2f2f2" stroke="black" points="3907.63,-1015.5 3907.63,-1501.9 4429.56,-1501.9 4429.56,-1015.5 3907.63,-1015.5"/>
+<text text-anchor="middle" x="4168.6" y="-1485.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="4168.6" y="-1468.5" font-family="Times,serif" font-size="14.00">PocoStorage</text>
+<text text-anchor="middle" x="4168.6" y="-1451.7" font-family="Times,serif" font-size="14.00">contracts/libs/PocoStorageLib.sol</text>
+<polyline fill="none" stroke="black" points="3907.63,-1443.5 4429.56,-1443.5 "/>
+<text text-anchor="start" x="3915.63" y="-1426.9" font-family="Times,serif" font-size="14.00">m_appregistry: IRegistry</text>
+<text text-anchor="start" x="3915.63" y="-1410.1" font-family="Times,serif" font-size="14.00">m_datasetregistry: IRegistry</text>
+<text text-anchor="start" x="3915.63" y="-1393.3" font-family="Times,serif" font-size="14.00">m_workerpoolregistry: IRegistry</text>
+<text text-anchor="start" x="3915.63" y="-1376.5" font-family="Times,serif" font-size="14.00">m_baseToken: IERC20</text>
+<text text-anchor="start" x="3915.63" y="-1359.7" font-family="Times,serif" font-size="14.00">m_name: string</text>
+<text text-anchor="start" x="3915.63" y="-1342.9" font-family="Times,serif" font-size="14.00">m_symbol: string</text>
+<text text-anchor="start" x="3915.63" y="-1326.1" font-family="Times,serif" font-size="14.00">m_decimals: uint8</text>
+<text text-anchor="start" x="3915.63" y="-1309.3" font-family="Times,serif" font-size="14.00">m_totalSupply: uint256</text>
+<text text-anchor="start" x="3915.63" y="-1292.5" font-family="Times,serif" font-size="14.00">m_balances: mapping(address=&gt;uint256)</text>
+<text text-anchor="start" x="3915.63" y="-1275.7" font-family="Times,serif" font-size="14.00">m_frozens: mapping(address=&gt;uint256)</text>
+<text text-anchor="start" x="3915.63" y="-1258.9" font-family="Times,serif" font-size="14.00">m_allowances: mapping(address=&gt;mapping(address=&gt;uint256))</text>
+<text text-anchor="start" x="3915.63" y="-1242.1" font-family="Times,serif" font-size="14.00">m_eip712DomainSeparator: bytes32</text>
+<text text-anchor="start" x="3915.63" y="-1225.3" font-family="Times,serif" font-size="14.00">m_presigned: mapping(bytes32=&gt;address)</text>
+<text text-anchor="start" x="3915.63" y="-1208.5" font-family="Times,serif" font-size="14.00">m_consumed: mapping(bytes32=&gt;uint256)</text>
+<text text-anchor="start" x="3915.63" y="-1191.7" font-family="Times,serif" font-size="14.00">m_deals: mapping(bytes32=&gt;IexecLibCore_v5.Deal)</text>
+<text text-anchor="start" x="3915.63" y="-1174.9" font-family="Times,serif" font-size="14.00">m_tasks: mapping(bytes32=&gt;IexecLibCore_v5.Task)</text>
+<text text-anchor="start" x="3915.63" y="-1158.1" font-family="Times,serif" font-size="14.00">m_consensus: mapping(bytes32=&gt;IexecLibCore_v5.Consensus)</text>
+<text text-anchor="start" x="3915.63" y="-1141.3" font-family="Times,serif" font-size="14.00">m_contributions: mapping(bytes32=&gt;mapping(address=&gt;IexecLibCore_v5.Contribution))</text>
+<text text-anchor="start" x="3915.63" y="-1124.5" font-family="Times,serif" font-size="14.00">m_workerScores: mapping(address=&gt;uint256)</text>
+<text text-anchor="start" x="3915.63" y="-1107.7" font-family="Times,serif" font-size="14.00">m_teebroker: address</text>
+<text text-anchor="start" x="3915.63" y="-1090.9" font-family="Times,serif" font-size="14.00">m_callbackgas: uint256</text>
+<text text-anchor="start" x="3915.63" y="-1074.1" font-family="Times,serif" font-size="14.00">m_categories: IexecLibCore_v5.Category[]</text>
+<text text-anchor="start" x="3915.63" y="-1057.3" font-family="Times,serif" font-size="14.00">m_v3_iexecHub: IexecHubV3Interface</text>
+<text text-anchor="start" x="3915.63" y="-1040.5" font-family="Times,serif" font-size="14.00">m_v3_scoreImported: mapping(address=&gt;bool)</text>
+<text text-anchor="start" x="3915.63" y="-1023.7" font-family="Times,serif" font-size="14.00">m_dealsBoost: mapping(bytes32=&gt;IexecLibCore_v5.DealBoost)</text>
+</g>
+<!-- 15&#45;&gt;62 -->
+<g id="edge9" class="edge">
+<title>15&#45;&gt;62</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2872.88,-106.93C3570.15,-123.78 4543.18,-158.39 4602.6,-221 4650.11,-271.07 4619.65,-464.72 4602.6,-531.6 4546.64,-751.07 4476.75,-785.77 4358.6,-979 4352.98,-988.18 4347.2,-997.48 4341.29,-1006.83"/>
+<polygon fill="black" stroke="black" points="4338.24,-1005.11 4335.84,-1015.43 4344.15,-1008.86 4338.24,-1005.11"/>
+</g>
+<!-- 78 -->
+<g id="node26" class="node">
+<title>78</title>
+<polygon fill="#f2f2f2" stroke="black" points="4994.02,-301.1 4994.02,-451.5 5303.17,-451.5 5303.17,-301.1 4994.02,-301.1"/>
+<text text-anchor="middle" x="5148.6" y="-434.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
+<text text-anchor="middle" x="5148.6" y="-418.1" font-family="Times,serif" font-size="14.00">IWorkerpool</text>
+<text text-anchor="middle" x="5148.6" y="-401.3" font-family="Times,serif" font-size="14.00">contracts/registries/workerpools/IWorkerpool.v8.sol</text>
+<polyline fill="none" stroke="black" points="4994.02,-393.1 5303.17,-393.1 "/>
+<text text-anchor="start" x="5002.02" y="-376.5" font-family="Times,serif" font-size="14.00">External:</text>
+<text text-anchor="start" x="5002.02" y="-359.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;owner(): address</text>
+<text text-anchor="start" x="5002.02" y="-342.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;m_workerpoolDescription(): string</text>
+<text text-anchor="start" x="5002.02" y="-326.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;m_schedulerRewardRatioPolicy(): uint256</text>
+<text text-anchor="start" x="5002.02" y="-309.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;m_workerStakeRatioPolicy(): uint256</text>
+</g>
+<!-- 15&#45;&gt;78 -->
+<g id="edge13" class="edge">
+<title>15&#45;&gt;78</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2872.84,-100.56C3641.72,-112.2 4790.31,-142.61 4979.6,-221 5017.83,-236.84 5052.94,-265.33 5081.12,-293.57"/>
+<polygon fill="black" stroke="black" points="5078.64,-296.03 5088.14,-300.73 5083.64,-291.14 5078.64,-296.03"/>
+</g>
+<!-- 24 -->
+<g id="node4" class="node">
+<title>24</title>
+<polygon fill="#f2f2f2" stroke="black" points="3899.69,-1656.5 3899.69,-1756.5 4169.5,-1756.5 4169.5,-1656.5 3899.69,-1656.5"/>
+<text text-anchor="middle" x="4034.6" y="-1739.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
+<text text-anchor="middle" x="4034.6" y="-1723.1" font-family="Times,serif" font-size="14.00">IexecHubV3Interface</text>
+<text text-anchor="middle" x="4034.6" y="-1706.3" font-family="Times,serif" font-size="14.00">contracts/interfaces/IexecHubV3Interface.sol</text>
+<polyline fill="none" stroke="black" points="3899.69,-1698.1 4169.5,-1698.1 "/>
+<text text-anchor="start" x="3907.69" y="-1681.5" font-family="Times,serif" font-size="14.00">External:</text>
+<text text-anchor="start" x="3907.69" y="-1664.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;viewScore(worker: address): uint256</text>
+</g>
+<!-- 30&#45;&gt;50 -->
+<g id="edge18" class="edge">
+<title>30&#45;&gt;50</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1438.23,-502.01C1434.02,-519.91 1429.59,-538.75 1425.1,-557.79"/>
+<polygon fill="black" stroke="black" points="1421.64,-557.23 1422.75,-567.77 1428.45,-558.83 1421.64,-557.23"/>
+</g>
+<!-- 30&#45;&gt;53 -->
 <g id="edge19" class="edge">
-<title>18&#45;&gt;56</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3764.81,-99.48C4225.12,-110.94 4754.75,-141.54 4828.68,-221 4879.9,-276.05 5003.83,-106.96 4819.68,-1444 4816.6,-1466.38 4811.8,-1489.8 4806.28,-1512.46"/>
-<polygon fill="black" stroke="black" points="4802.81,-1511.91 4803.79,-1522.46 4809.61,-1513.6 4802.81,-1511.91"/>
+<title>30&#45;&gt;53</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1833.55,-501.99C1860.65,-520.95 1885.56,-542.69 1906.6,-567.6 2038.73,-724.03 1991.97,-811.72 2016.6,-1015 2042.65,-1230.05 2147.58,-1329.86 2016.6,-1502.4 1980.61,-1549.81 1940.76,-1511.63 1887.6,-1538.4 1854.89,-1554.87 1822.29,-1576.67 1792.72,-1599.07"/>
+<polygon fill="black" stroke="black" points="1790.27,-1596.54 1784.47,-1605.4 1794.53,-1602.09 1790.27,-1596.54"/>
 </g>
-<!-- 57 -->
-<g id="node20" class="node">
-<title>57</title>
-<polygon fill="#f2f2f2" stroke="black" points="4894.07,-1480.5 4894.07,-1815.7 5117.29,-1815.7 5117.29,-1480.5 4894.07,-1480.5"/>
-<text text-anchor="middle" x="5005.68" y="-1799.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="5005.68" y="-1782.3" font-family="Times,serif" font-size="14.00">RequestOrder</text>
-<text text-anchor="middle" x="5005.68" y="-1765.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="4894.07,-1757.3 5117.29,-1757.3 "/>
-<text text-anchor="start" x="4902.07" y="-1740.7" font-family="Times,serif" font-size="14.00">app: address</text>
-<text text-anchor="start" x="4902.07" y="-1723.9" font-family="Times,serif" font-size="14.00">appmaxprice: uint256</text>
-<text text-anchor="start" x="4902.07" y="-1707.1" font-family="Times,serif" font-size="14.00">dataset: address</text>
-<text text-anchor="start" x="4902.07" y="-1690.3" font-family="Times,serif" font-size="14.00">datasetmaxprice: uint256</text>
-<text text-anchor="start" x="4902.07" y="-1673.5" font-family="Times,serif" font-size="14.00">workerpool: address</text>
-<text text-anchor="start" x="4902.07" y="-1656.7" font-family="Times,serif" font-size="14.00">workerpoolmaxprice: uint256</text>
-<text text-anchor="start" x="4902.07" y="-1639.9" font-family="Times,serif" font-size="14.00">requester: address</text>
-<text text-anchor="start" x="4902.07" y="-1623.1" font-family="Times,serif" font-size="14.00">volume: uint256</text>
-<text text-anchor="start" x="4902.07" y="-1606.3" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
-<text text-anchor="start" x="4902.07" y="-1589.5" font-family="Times,serif" font-size="14.00">category: uint256</text>
-<text text-anchor="start" x="4902.07" y="-1572.7" font-family="Times,serif" font-size="14.00">trust: uint256</text>
-<text text-anchor="start" x="4902.07" y="-1555.9" font-family="Times,serif" font-size="14.00">beneficiary: address</text>
-<text text-anchor="start" x="4902.07" y="-1539.1" font-family="Times,serif" font-size="14.00">callback: address</text>
-<text text-anchor="start" x="4902.07" y="-1522.3" font-family="Times,serif" font-size="14.00">params: string</text>
-<text text-anchor="start" x="4902.07" y="-1505.5" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
-<text text-anchor="start" x="4902.07" y="-1488.7" font-family="Times,serif" font-size="14.00">sign: bytes</text>
-</g>
-<!-- 18&#45;&gt;57 -->
+<!-- 30&#45;&gt;54 -->
 <g id="edge20" class="edge">
-<title>18&#45;&gt;57</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3765.07,-99.43C4244.16,-110.72 4805.73,-141.13 4886.68,-221 5058.86,-390.87 5037.97,-1127.29 5018.09,-1470.2"/>
-<polygon fill="black" stroke="black" points="5014.6,-1470.04 5017.51,-1480.23 5021.59,-1470.45 5014.6,-1470.04"/>
+<title>30&#45;&gt;54</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1900.23,-501.96C1927.39,-520.84 1952.31,-542.58 1973.6,-567.6 2221.65,-859.25 2114.34,-1361.08 2047.44,-1588"/>
+<polygon fill="black" stroke="black" points="2044.08,-1587.03 2044.58,-1597.61 2050.79,-1589.02 2044.08,-1587.03"/>
 </g>
-<!-- 18&#45;&gt;62 -->
+<!-- 30&#45;&gt;55 -->
 <g id="edge21" class="edge">
-<title>18&#45;&gt;62</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2358.52,-115.37C1794.85,-136.46 1090.38,-172.33 1044.68,-221 990.62,-278.58 1019.71,-509.33 1040.15,-633.62"/>
-<polygon fill="black" stroke="black" points="1036.76,-634.56 1041.85,-643.85 1043.66,-633.41 1036.76,-634.56"/>
+<title>30&#45;&gt;55</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1732.24,-501.94C1758.81,-521.42 1783.66,-543.29 1804.6,-567.6 1942.4,-727.63 2118.47,-1346.88 1975.6,-1502.4 1911.62,-1572.04 1637.91,-1499.78 1551.6,-1538.4 1531.11,-1547.57 1511.5,-1560.12 1493.29,-1574.27"/>
+<polygon fill="black" stroke="black" points="1490.65,-1571.89 1485.03,-1580.87 1495.02,-1577.36 1490.65,-1571.89"/>
 </g>
-<!-- 18&#45;&gt;63 -->
+<!-- 30&#45;&gt;56 -->
 <g id="edge22" class="edge">
-<title>18&#45;&gt;63</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3021.75,-184.58C3017.26,-196.69 3013.09,-209.05 3009.68,-221 2978.47,-330.34 3038.92,-385.39 2966.68,-473.2 2552.04,-977.27 1747.05,-1131.82 1326.08,-1178.9"/>
-<polygon fill="black" stroke="black" points="1325.45,-1175.45 1315.9,-1180.02 1326.22,-1182.4 1325.45,-1175.45"/>
-</g>
-<!-- 79 -->
-<g id="node28" class="node">
-<title>79</title>
-<polygon fill="#f2f2f2" stroke="black" points="5367.11,-271.9 5367.11,-422.3 5676.25,-422.3 5676.25,-271.9 5367.11,-271.9"/>
-<text text-anchor="middle" x="5521.68" y="-405.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
-<text text-anchor="middle" x="5521.68" y="-388.9" font-family="Times,serif" font-size="14.00">IWorkerpool</text>
-<text text-anchor="middle" x="5521.68" y="-372.1" font-family="Times,serif" font-size="14.00">contracts/registries/workerpools/IWorkerpool.v8.sol</text>
-<polyline fill="none" stroke="black" points="5367.11,-363.9 5676.25,-363.9 "/>
-<text text-anchor="start" x="5375.11" y="-347.3" font-family="Times,serif" font-size="14.00">External:</text>
-<text text-anchor="start" x="5375.11" y="-330.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;owner(): address</text>
-<text text-anchor="start" x="5375.11" y="-313.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;m_workerpoolDescription(): string</text>
-<text text-anchor="start" x="5375.11" y="-296.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;m_schedulerRewardRatioPolicy(): uint256</text>
-<text text-anchor="start" x="5375.11" y="-280.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;m_workerStakeRatioPolicy(): uint256</text>
-</g>
-<!-- 18&#45;&gt;79 -->
-<g id="edge25" class="edge">
-<title>18&#45;&gt;79</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3765.08,-111.77C4384.72,-131.27 5211.06,-166.89 5357.68,-221 5385.18,-231.15 5411.86,-247.6 5435.43,-265.28"/>
-<polygon fill="black" stroke="black" points="5433.57,-268.26 5443.64,-271.57 5437.83,-262.71 5433.57,-268.26"/>
+<title>30&#45;&gt;56</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1137.84,-502.01C920.71,-603.76 654.33,-770.94 529.6,-1015 485.45,-1101.38 507.46,-1354.23 529.66,-1528.72"/>
+<polygon fill="black" stroke="black" points="526.21,-1529.32 530.95,-1538.79 533.15,-1528.42 526.21,-1529.32"/>
 </g>
-<!-- 27 -->
-<g id="node8" class="node">
-<title>27</title>
-<polygon fill="#f2f2f2" stroke="black" points="785.78,-1598.1 785.78,-1698.1 1055.59,-1698.1 1055.59,-1598.1 785.78,-1598.1"/>
-<text text-anchor="middle" x="920.68" y="-1681.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
-<text text-anchor="middle" x="920.68" y="-1664.7" font-family="Times,serif" font-size="14.00">IexecHubV3Interface</text>
-<text text-anchor="middle" x="920.68" y="-1647.9" font-family="Times,serif" font-size="14.00">contracts/interfaces/IexecHubV3Interface.sol</text>
-<polyline fill="none" stroke="black" points="785.78,-1639.7 1055.59,-1639.7 "/>
-<text text-anchor="start" x="793.78" y="-1623.1" font-family="Times,serif" font-size="14.00">External:</text>
-<text text-anchor="start" x="793.78" y="-1606.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;viewScore(worker: address): uint256</text>
-</g>
-<!-- 33&#45;&gt;51 -->
-<g id="edge29" class="edge">
-<title>33&#45;&gt;51</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4142.96,-472.71C4142.77,-481.43 4142.57,-490.36 4142.37,-499.39"/>
-<polygon fill="black" stroke="black" points="4138.87,-499.55 4142.15,-509.62 4145.87,-499.7 4138.87,-499.55"/>
+<!-- 34&#45;&gt;61 -->
+<g id="edge23" class="edge">
+<title>34&#45;&gt;61</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3483.48,-497.56C3663.83,-569.88 3885.09,-658.61 4026.47,-715.3"/>
+<polygon fill="black" stroke="black" points="4025.5,-718.69 4036.08,-719.16 4028.11,-712.19 4025.5,-718.69"/>
 </g>
-<!-- 33&#45;&gt;54 -->
-<g id="edge30" class="edge">
-<title>33&#45;&gt;54</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3780.39,-472.77C3760.29,-484.03 3740.89,-496.16 3722.68,-509.2 3529.57,-647.44 3542.8,-746.12 3381.68,-920.6 3366.12,-937.46 3353.61,-935.46 3344.68,-956.6 3302.55,-1056.38 3296.31,-1347.09 3344.68,-1444 3376.2,-1507.15 3437.74,-1555.8 3494.11,-1589.64"/>
-<polygon fill="black" stroke="black" points="3492.35,-1592.67 3502.75,-1594.73 3495.91,-1586.64 3492.35,-1592.67"/>
+<!-- 34&#45;&gt;62 -->
+<g id="edge24" class="edge">
+<title>34&#45;&gt;62</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3318.23,-497.64C3467.27,-630.85 3711.31,-848.97 3899.82,-1017.47"/>
+<polygon fill="black" stroke="black" points="3897.56,-1020.14 3907.34,-1024.19 3902.22,-1014.92 3897.56,-1020.14"/>
 </g>
-<!-- 33&#45;&gt;55 -->
-<g id="edge31" class="edge">
-<title>33&#45;&gt;55</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3946.42,-472.71C3933.92,-484.25 3922.17,-496.43 3911.68,-509.2 3774.24,-676.55 3762.47,-744.52 3718.68,-956.6 3696.78,-1062.67 3670.31,-1347.09 3718.68,-1444 3750.2,-1507.15 3811.74,-1555.8 3868.11,-1589.64"/>
-<polygon fill="black" stroke="black" points="3866.35,-1592.67 3876.75,-1594.73 3869.91,-1586.64 3866.35,-1592.67"/>
+<!-- 35&#45;&gt;61 -->
+<g id="edge25" class="edge">
+<title>35&#45;&gt;61</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4311.08,-518.79C4278.04,-577.57 4240.94,-643.58 4212.89,-693.5"/>
+<polygon fill="black" stroke="black" points="4209.78,-691.88 4207.93,-702.31 4215.88,-695.31 4209.78,-691.88"/>
 </g>
-<!-- 33&#45;&gt;56 -->
-<g id="edge32" class="edge">
-<title>33&#45;&gt;56</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4365.62,-472.95C4526.37,-578.32 4731.12,-745.65 4819.68,-956.6 4895.73,-1137.75 4852.31,-1368.91 4810.94,-1512.47"/>
-<polygon fill="black" stroke="black" points="4807.54,-1511.64 4808.09,-1522.22 4814.26,-1513.6 4807.54,-1511.64"/>
+<!-- 35&#45;&gt;62 -->
+<g id="edge26" class="edge">
+<title>35&#45;&gt;62</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4384.88,-518.77C4376.76,-642.56 4357.11,-825.99 4309.6,-979 4306.82,-987.94 4303.78,-996.93 4300.52,-1005.94"/>
+<polygon fill="black" stroke="black" points="4297.23,-1004.74 4297.05,-1015.34 4303.8,-1007.17 4297.23,-1004.74"/>
 </g>
-<!-- 33&#45;&gt;57 -->
-<g id="edge33" class="edge">
-<title>33&#45;&gt;57</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4570.63,-472.82C4589.53,-483.96 4607.67,-496.06 4624.68,-509.2 4812.79,-654.5 4835.44,-733.59 4917.68,-956.6 4979.34,-1123.8 4999.16,-1327.48 5004.89,-1470.15"/>
-<polygon fill="black" stroke="black" points="5001.4,-1470.45 5005.28,-1480.31 5008.39,-1470.19 5001.4,-1470.45"/>
+<!-- 44&#45;&gt;36 -->
+<g id="edge28" class="edge">
+<title>44&#45;&gt;36</title>
+<path fill="none" stroke="black" d="M4622.61,-1409.75C4637.37,-1440.6 4653.18,-1472.71 4668.6,-1502.4 4698.78,-1560.54 4736.71,-1626.25 4760.56,-1666.78"/>
+<polygon fill="black" stroke="black" points="4760.65,-1666.93 4767.14,-1670.07 4766.75,-1677.27 4760.25,-1674.13 4760.65,-1666.93"/>
 </g>
-<!-- 45&#45;&gt;37 -->
-<g id="edge35" class="edge">
-<title>45&#45;&gt;37</title>
-<path fill="none" stroke="black" d="M2924.37,-1351.3C2947.65,-1441.52 2975.54,-1549.66 2990.32,-1606.92"/>
-<polygon fill="black" stroke="black" points="2990.35,-1607.05 2995.72,-1611.86 2993.35,-1618.67 2987.98,-1613.86 2990.35,-1607.05"/>
+<!-- 45&#45;&gt;36 -->
+<g id="edge27" class="edge">
+<title>45&#45;&gt;36</title>
+<path fill="none" stroke="black" d="M4783.6,-1334.07C4783.6,-1429.14 4783.6,-1590.39 4783.6,-1665.18"/>
+<polygon fill="black" stroke="black" points="4783.6,-1665.26 4787.6,-1671.26 4783.6,-1677.26 4779.6,-1671.26 4783.6,-1665.26"/>
 </g>
-<!-- 46&#45;&gt;37 -->
-<g id="edge34" class="edge">
-<title>46&#45;&gt;37</title>
-<path fill="none" stroke="black" d="M3096.5,-1275.67C3071.92,-1370.94 3030.2,-1532.66 3010.96,-1607.24"/>
-<polygon fill="black" stroke="black" points="3010.96,-1607.24 3013.34,-1614.05 3007.97,-1618.86 3005.59,-1612.05 3010.96,-1607.24"/>
+<!-- 46&#45;&gt;36 -->
+<g id="edge29" class="edge">
+<title>46&#45;&gt;36</title>
+<path fill="none" stroke="black" d="M4882.2,-932.6C4889.01,-959.82 4894.91,-988.03 4898.6,-1015 4927.91,-1229.63 4953.78,-1292.93 4898.6,-1502.4 4882.16,-1564.81 4841.66,-1628.17 4813.4,-1667.15"/>
+<polygon fill="black" stroke="black" points="4813.27,-1667.34 4812.93,-1674.54 4806.15,-1677 4806.49,-1669.79 4813.27,-1667.34"/>
 </g>
-<!-- 47&#45;&gt;37 -->
-<g id="edge36" class="edge">
-<title>47&#45;&gt;37</title>
-<path fill="none" stroke="black" d="M3247.95,-874.47C3261.84,-1057.6 3275.03,-1346.22 3230.68,-1444 3196.52,-1519.32 3119.21,-1577.98 3063.65,-1612.48"/>
-<polygon fill="black" stroke="black" points="3063.44,-1612.61 3060.4,-1619.15 3053.19,-1618.85 3056.23,-1612.31 3063.44,-1612.61"/>
+<!-- 46&#45;&gt;45 -->
+<g id="edge30" class="edge">
+<title>46&#45;&gt;45</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4815.88,-932.58C4807.91,-1012.86 4798.55,-1107.12 4791.97,-1173.42"/>
+<polygon fill="black" stroke="black" points="4788.48,-1173.11 4790.97,-1183.41 4795.44,-1173.8 4788.48,-1173.11"/>
 </g>
-<!-- 47&#45;&gt;46 -->
-<g id="edge37" class="edge">
-<title>47&#45;&gt;46</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3195.04,-874.18C3175.45,-954.46 3152.44,-1048.72 3136.25,-1115.02"/>
-<polygon fill="black" stroke="black" points="3132.79,-1114.46 3133.82,-1125.01 3139.59,-1116.12 3132.79,-1114.46"/>
+<!-- 52 -->
+<g id="node14" class="node">
+<title>52</title>
+<polygon fill="#f2f2f2" stroke="black" points="592.99,-1191.9 592.99,-1325.5 816.21,-1325.5 816.21,-1191.9 592.99,-1191.9"/>
+<text text-anchor="middle" x="704.6" y="-1308.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="704.6" y="-1292.1" font-family="Times,serif" font-size="14.00">EIP712Domain</text>
+<text text-anchor="middle" x="704.6" y="-1275.3" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="592.99,-1267.1 816.21,-1267.1 "/>
+<text text-anchor="start" x="600.99" y="-1250.5" font-family="Times,serif" font-size="14.00">name: string</text>
+<text text-anchor="start" x="600.99" y="-1233.7" font-family="Times,serif" font-size="14.00">version: string</text>
+<text text-anchor="start" x="600.99" y="-1216.9" font-family="Times,serif" font-size="14.00">chainId: uint256</text>
+<text text-anchor="start" x="600.99" y="-1200.1" font-family="Times,serif" font-size="14.00">verifyingContract: address</text>
+</g>
+<!-- 50&#45;&gt;52 -->
+<g id="edge41" class="edge">
+<title>50&#45;&gt;52</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1157.71,-827.66C1044.52,-864.96 910.32,-924.6 815.6,-1015 767.74,-1060.67 736.23,-1129.48 719.06,-1182.18"/>
+<polygon fill="black" stroke="black" points="715.69,-1181.24 716.02,-1191.83 722.37,-1183.34 715.69,-1181.24"/>
 </g>
-<!-- 53 -->
-<g id="node16" class="node">
-<title>53</title>
-<polygon fill="#f2f2f2" stroke="black" points="3354.07,-1133.5 3354.07,-1267.1 3577.29,-1267.1 3577.29,-1133.5 3354.07,-1133.5"/>
-<text text-anchor="middle" x="3465.68" y="-1250.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="3465.68" y="-1233.7" font-family="Times,serif" font-size="14.00">EIP712Domain</text>
-<text text-anchor="middle" x="3465.68" y="-1216.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="3354.07,-1208.7 3577.29,-1208.7 "/>
-<text text-anchor="start" x="3362.07" y="-1192.1" font-family="Times,serif" font-size="14.00">name: string</text>
-<text text-anchor="start" x="3362.07" y="-1175.3" font-family="Times,serif" font-size="14.00">version: string</text>
-<text text-anchor="start" x="3362.07" y="-1158.5" font-family="Times,serif" font-size="14.00">chainId: uint256</text>
-<text text-anchor="start" x="3362.07" y="-1141.7" font-family="Times,serif" font-size="14.00">verifyingContract: address</text>
-</g>
-<!-- 51&#45;&gt;53 -->
-<g id="edge48" class="edge">
-<title>51&#45;&gt;53</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3920.64,-771.1C3808.97,-808.77 3676.92,-868.17 3582.68,-956.6 3533.96,-1002.32 3500.72,-1071.12 3482.17,-1123.81"/>
-<polygon fill="black" stroke="black" points="3478.8,-1122.86 3478.88,-1133.45 3485.42,-1125.12 3478.8,-1122.86"/>
+<!-- 50&#45;&gt;53 -->
+<g id="edge42" class="edge">
+<title>50&#45;&gt;53</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1591.38,-946.21C1608.77,-967.59 1624.06,-990.59 1635.6,-1015 1681.98,-1113.11 1676.79,-1417.34 1672.93,-1587.41"/>
+<polygon fill="black" stroke="black" points="1669.43,-1587.34 1672.7,-1597.41 1676.43,-1587.5 1669.43,-1587.34"/>
 </g>
-<!-- 51&#45;&gt;54 -->
-<g id="edge49" class="edge">
-<title>51&#45;&gt;54</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3920.76,-790.01C3842.21,-828.02 3760.44,-882.31 3709.68,-956.6 3591.96,-1128.88 3585.52,-1381.63 3596.68,-1528.77"/>
-<polygon fill="black" stroke="black" points="3593.23,-1529.49 3597.51,-1539.18 3600.2,-1528.93 3593.23,-1529.49"/>
+<!-- 50&#45;&gt;54 -->
+<g id="edge43" class="edge">
+<title>50&#45;&gt;54</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1591.7,-812.21C1711.93,-844.86 1852.94,-904.98 1933.6,-1015 2056.71,-1182.92 2043.63,-1439 2024.94,-1587.55"/>
+<polygon fill="black" stroke="black" points="2021.45,-1587.25 2023.64,-1597.61 2028.39,-1588.14 2021.45,-1587.25"/>
 </g>
-<!-- 51&#45;&gt;55 -->
-<g id="edge50" class="edge">
-<title>51&#45;&gt;55</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4018.92,-920.12C4014.61,-932.28 4010.81,-944.49 4007.68,-956.6 3957.04,-1152.35 3960.94,-1389.63 3972.08,-1528.92"/>
-<polygon fill="black" stroke="black" points="3968.62,-1529.51 3972.93,-1539.19 3975.6,-1528.93 3968.62,-1529.51"/>
+<!-- 50&#45;&gt;55 -->
+<g id="edge44" class="edge">
+<title>50&#45;&gt;55</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1368.9,-978.66C1367.27,-1158.48 1367.53,-1415.16 1369.67,-1570.48"/>
+<polygon fill="black" stroke="black" points="1366.18,-1570.62 1369.82,-1580.56 1373.17,-1570.52 1366.18,-1570.62"/>
 </g>
-<!-- 51&#45;&gt;56 -->
-<g id="edge51" class="edge">
-<title>51&#45;&gt;56</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4354.69,-736.26C4498.51,-762.41 4677.28,-821.83 4770.68,-956.6 4830.77,-1043.31 4801.17,-1337.04 4779.71,-1512.24"/>
-<polygon fill="black" stroke="black" points="4776.22,-1511.95 4778.47,-1522.3 4783.17,-1512.81 4776.22,-1511.95"/>
+<!-- 50&#45;&gt;56 -->
+<g id="edge45" class="edge">
+<title>50&#45;&gt;56</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1157.46,-810.15C945.87,-850.5 645.97,-922.65 574.6,-1015 514.83,-1092.33 519.8,-1350.89 533.63,-1528.7"/>
+<polygon fill="black" stroke="black" points="530.14,-1529 534.42,-1538.69 537.12,-1528.45 530.14,-1529"/>
 </g>
-<!-- 51&#45;&gt;57 -->
-<g id="edge52" class="edge">
-<title>51&#45;&gt;57</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4354.54,-740.86C4502.56,-769.05 4692.48,-829.04 4810.68,-956.6 4879.57,-1030.95 4936.25,-1291.38 4970.61,-1470.26"/>
-<polygon fill="black" stroke="black" points="4967.22,-1471.15 4972.53,-1480.32 4974.09,-1469.84 4967.22,-1471.15"/>
+<!-- 57 -->
+<g id="node19" class="node">
+<title>57</title>
+<polygon fill="#f2f2f2" stroke="black" points="1411.99,-1200.3 1411.99,-1317.1 1635.21,-1317.1 1635.21,-1200.3 1411.99,-1200.3"/>
+<text text-anchor="middle" x="1523.6" y="-1300.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="1523.6" y="-1283.7" font-family="Times,serif" font-size="14.00">AppOrderOperation</text>
+<text text-anchor="middle" x="1523.6" y="-1266.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="1411.99,-1258.7 1635.21,-1258.7 "/>
+<text text-anchor="start" x="1419.99" y="-1242.1" font-family="Times,serif" font-size="14.00">order: AppOrder</text>
+<text text-anchor="start" x="1419.99" y="-1225.3" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
+<text text-anchor="start" x="1419.99" y="-1208.5" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+</g>
+<!-- 50&#45;&gt;57 -->
+<g id="edge46" class="edge">
+<title>50&#45;&gt;57</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1430.89,-978.6C1454.01,-1054.57 1479.59,-1135.58 1498.09,-1190.65"/>
+<polygon fill="black" stroke="black" points="1494.82,-1191.92 1501.34,-1200.28 1501.46,-1189.68 1494.82,-1191.92"/>
 </g>
 <!-- 58 -->
-<g id="node21" class="node">
+<g id="node20" class="node">
 <title>58</title>
-<polygon fill="#f2f2f2" stroke="black" points="3728.07,-1141.9 3728.07,-1258.7 3951.29,-1258.7 3951.29,-1141.9 3728.07,-1141.9"/>
-<text text-anchor="middle" x="3839.68" y="-1242.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="3839.68" y="-1225.3" font-family="Times,serif" font-size="14.00">AppOrderOperation</text>
-<text text-anchor="middle" x="3839.68" y="-1208.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="3728.07,-1200.3 3951.29,-1200.3 "/>
-<text text-anchor="start" x="3736.07" y="-1183.7" font-family="Times,serif" font-size="14.00">order: AppOrder</text>
-<text text-anchor="start" x="3736.07" y="-1166.9" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
-<text text-anchor="start" x="3736.07" y="-1150.1" font-family="Times,serif" font-size="14.00">sign: bytes</text>
-</g>
-<!-- 51&#45;&gt;58 -->
-<g id="edge53" class="edge">
-<title>51&#45;&gt;58</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3979.64,-920.41C3971.7,-932.54 3963.99,-944.67 3956.68,-956.6 3921.38,-1014.22 3886.39,-1082.79 3863.82,-1132.32"/>
-<polygon fill="black" stroke="black" points="3860.53,-1131.1 3859.61,-1141.65 3866.91,-1133.97 3860.53,-1131.1"/>
+<polygon fill="#f2f2f2" stroke="black" points="1709.99,-1200.3 1709.99,-1317.1 1933.21,-1317.1 1933.21,-1200.3 1709.99,-1200.3"/>
+<text text-anchor="middle" x="1821.6" y="-1300.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="1821.6" y="-1283.7" font-family="Times,serif" font-size="14.00">DatasetOrderOperation</text>
+<text text-anchor="middle" x="1821.6" y="-1266.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="1709.99,-1258.7 1933.21,-1258.7 "/>
+<text text-anchor="start" x="1717.99" y="-1242.1" font-family="Times,serif" font-size="14.00">order: DatasetOrder</text>
+<text text-anchor="start" x="1717.99" y="-1225.3" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
+<text text-anchor="start" x="1717.99" y="-1208.5" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+</g>
+<!-- 50&#45;&gt;58 -->
+<g id="edge47" class="edge">
+<title>50&#45;&gt;58</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1591.66,-923.07C1625.71,-951.2 1658.78,-982.19 1686.6,-1015 1731.32,-1067.76 1765.94,-1139.07 1789.14,-1190.73"/>
+<polygon fill="black" stroke="black" points="1786.07,-1192.43 1793.34,-1200.14 1792.46,-1189.58 1786.07,-1192.43"/>
 </g>
 <!-- 59 -->
-<g id="node22" class="node">
+<g id="node21" class="node">
 <title>59</title>
-<polygon fill="#f2f2f2" stroke="black" points="4026.07,-1141.9 4026.07,-1258.7 4249.29,-1258.7 4249.29,-1141.9 4026.07,-1141.9"/>
-<text text-anchor="middle" x="4137.68" y="-1242.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="4137.68" y="-1225.3" font-family="Times,serif" font-size="14.00">DatasetOrderOperation</text>
-<text text-anchor="middle" x="4137.68" y="-1208.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="4026.07,-1200.3 4249.29,-1200.3 "/>
-<text text-anchor="start" x="4034.07" y="-1183.7" font-family="Times,serif" font-size="14.00">order: DatasetOrder</text>
-<text text-anchor="start" x="4034.07" y="-1166.9" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
-<text text-anchor="start" x="4034.07" y="-1150.1" font-family="Times,serif" font-size="14.00">sign: bytes</text>
-</g>
-<!-- 51&#45;&gt;59 -->
-<g id="edge54" class="edge">
-<title>51&#45;&gt;59</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4131,-920.2C4130.71,-995.85 4131.31,-1076.51 4132.82,-1131.56"/>
-<polygon fill="black" stroke="black" points="4129.33,-1131.98 4133.12,-1141.88 4136.33,-1131.78 4129.33,-1131.98"/>
+<polygon fill="#f2f2f2" stroke="black" points="1113.99,-1200.3 1113.99,-1317.1 1337.21,-1317.1 1337.21,-1200.3 1113.99,-1200.3"/>
+<text text-anchor="middle" x="1225.6" y="-1300.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="1225.6" y="-1283.7" font-family="Times,serif" font-size="14.00">WorkerpoolOrderOperation</text>
+<text text-anchor="middle" x="1225.6" y="-1266.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="1113.99,-1258.7 1337.21,-1258.7 "/>
+<text text-anchor="start" x="1121.99" y="-1242.1" font-family="Times,serif" font-size="14.00">order: WorkerpoolOrder</text>
+<text text-anchor="start" x="1121.99" y="-1225.3" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
+<text text-anchor="start" x="1121.99" y="-1208.5" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+</g>
+<!-- 50&#45;&gt;59 -->
+<g id="edge48" class="edge">
+<title>50&#45;&gt;59</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1304.95,-978.6C1281.28,-1054.41 1256.98,-1135.25 1241.52,-1190.3"/>
+<polygon fill="black" stroke="black" points="1238.05,-1189.7 1238.74,-1200.28 1244.8,-1191.58 1238.05,-1189.7"/>
 </g>
 <!-- 60 -->
-<g id="node23" class="node">
+<g id="node22" class="node">
 <title>60</title>
-<polygon fill="#f2f2f2" stroke="black" points="4306.07,-1141.9 4306.07,-1258.7 4529.29,-1258.7 4529.29,-1141.9 4306.07,-1141.9"/>
-<text text-anchor="middle" x="4417.68" y="-1242.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="4417.68" y="-1225.3" font-family="Times,serif" font-size="14.00">WorkerpoolOrderOperation</text>
-<text text-anchor="middle" x="4417.68" y="-1208.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="4306.07,-1200.3 4529.29,-1200.3 "/>
-<text text-anchor="start" x="4314.07" y="-1183.7" font-family="Times,serif" font-size="14.00">order: WorkerpoolOrder</text>
-<text text-anchor="start" x="4314.07" y="-1166.9" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
-<text text-anchor="start" x="4314.07" y="-1150.1" font-family="Times,serif" font-size="14.00">sign: bytes</text>
-</g>
-<!-- 51&#45;&gt;60 -->
-<g id="edge55" class="edge">
-<title>51&#45;&gt;60</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4261.23,-920.3C4268.59,-932.52 4275.79,-944.68 4282.68,-956.6 4316.45,-1015.03 4351.57,-1083.41 4377.66,-1132.66"/>
-<polygon fill="black" stroke="black" points="4374.65,-1134.44 4382.43,-1141.63 4380.83,-1131.16 4374.65,-1134.44"/>
+<polygon fill="#f2f2f2" stroke="black" points="833.99,-1200.3 833.99,-1317.1 1057.21,-1317.1 1057.21,-1200.3 833.99,-1200.3"/>
+<text text-anchor="middle" x="945.6" y="-1300.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="945.6" y="-1283.7" font-family="Times,serif" font-size="14.00">RequestOrderOperation</text>
+<text text-anchor="middle" x="945.6" y="-1266.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="833.99,-1258.7 1057.21,-1258.7 "/>
+<text text-anchor="start" x="841.99" y="-1242.1" font-family="Times,serif" font-size="14.00">order: RequestOrder</text>
+<text text-anchor="start" x="841.99" y="-1225.3" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
+<text text-anchor="start" x="841.99" y="-1208.5" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+</g>
+<!-- 50&#45;&gt;60 -->
+<g id="edge49" class="edge">
+<title>50&#45;&gt;60</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1157.8,-920.05C1123.57,-949.19 1090.37,-981.3 1062.6,-1015 1018.69,-1068.29 984,-1139.37 963.88,-1190.82"/>
+<polygon fill="black" stroke="black" points="960.6,-1189.6 960.29,-1200.19 967.14,-1192.11 960.6,-1189.6"/>
 </g>
-<!-- 61 -->
-<g id="node24" class="node">
-<title>61</title>
-<polygon fill="#f2f2f2" stroke="black" points="4547.07,-1141.9 4547.07,-1258.7 4770.29,-1258.7 4770.29,-1141.9 4547.07,-1141.9"/>
-<text text-anchor="middle" x="4658.68" y="-1242.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="4658.68" y="-1225.3" font-family="Times,serif" font-size="14.00">RequestOrderOperation</text>
-<text text-anchor="middle" x="4658.68" y="-1208.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="4547.07,-1200.3 4770.29,-1200.3 "/>
-<text text-anchor="start" x="4555.07" y="-1183.7" font-family="Times,serif" font-size="14.00">order: RequestOrder</text>
-<text text-anchor="start" x="4555.07" y="-1166.9" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
-<text text-anchor="start" x="4555.07" y="-1150.1" font-family="Times,serif" font-size="14.00">sign: bytes</text>
-</g>
-<!-- 51&#45;&gt;61 -->
-<g id="edge56" class="edge">
-<title>51&#45;&gt;61</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4354.54,-820.95C4416.42,-857.55 4480.36,-903.09 4529.68,-956.6 4576.47,-1007.36 4609.06,-1079.75 4630.06,-1132.25"/>
-<polygon fill="black" stroke="black" points="4626.91,-1133.8 4633.84,-1141.81 4633.41,-1131.23 4626.91,-1133.8"/>
+<!-- 51 -->
+<g id="node13" class="node">
+<title>51</title>
+<polygon fill="#f2f2f2" stroke="black" points="997.99,-1656.5 997.99,-1756.5 1221.21,-1756.5 1221.21,-1656.5 997.99,-1656.5"/>
+<text text-anchor="middle" x="1109.6" y="-1739.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Enum&gt;&gt;</text>
+<text text-anchor="middle" x="1109.6" y="-1723.1" font-family="Times,serif" font-size="14.00">OrderOperationEnum</text>
+<text text-anchor="middle" x="1109.6" y="-1706.3" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="997.99,-1698.1 1221.21,-1698.1 "/>
+<text text-anchor="start" x="1005.99" y="-1681.5" font-family="Times,serif" font-size="14.00">SIGN: 0</text>
+<text text-anchor="start" x="1005.99" y="-1664.7" font-family="Times,serif" font-size="14.00">CLOSE: 1</text>
+</g>
+<!-- 51&#45;&gt;50 -->
+<g id="edge31" class="edge">
+<title>51&#45;&gt;50</title>
+<path fill="none" stroke="black" d="M1104.03,-1656.28C1089.2,-1518.14 1053.3,-1129.46 1104.6,-1015 1116.06,-989.43 1131.73,-965.46 1149.79,-943.31"/>
+<polygon fill="black" stroke="black" points="1149.95,-943.11 1150.75,-935.95 1157.67,-933.92 1156.88,-941.09 1149.95,-943.11"/>
 </g>
-<!-- 52 -->
-<g id="node15" class="node">
-<title>52</title>
-<polygon fill="#f2f2f2" stroke="black" points="4166.07,-1598.1 4166.07,-1698.1 4389.29,-1698.1 4389.29,-1598.1 4166.07,-1598.1"/>
-<text text-anchor="middle" x="4277.68" y="-1681.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Enum&gt;&gt;</text>
-<text text-anchor="middle" x="4277.68" y="-1664.7" font-family="Times,serif" font-size="14.00">OrderOperationEnum</text>
-<text text-anchor="middle" x="4277.68" y="-1647.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="4166.07,-1639.7 4389.29,-1639.7 "/>
-<text text-anchor="start" x="4174.07" y="-1623.1" font-family="Times,serif" font-size="14.00">SIGN: 0</text>
-<text text-anchor="start" x="4174.07" y="-1606.3" font-family="Times,serif" font-size="14.00">CLOSE: 1</text>
-</g>
-<!-- 52&#45;&gt;51 -->
-<g id="edge38" class="edge">
-<title>52&#45;&gt;51</title>
-<path fill="none" stroke="black" d="M4279.1,-1597.62C4282.6,-1460.54 4289.24,-1077.98 4258.68,-956.6 4256.62,-948.43 4254.26,-940.22 4251.64,-932.01"/>
-<polygon fill="black" stroke="black" points="4251.56,-931.8 4245.87,-927.38 4247.76,-920.42 4253.46,-924.84 4251.56,-931.8"/>
+<!-- 52&#45;&gt;50 -->
+<g id="edge32" class="edge">
+<title>52&#45;&gt;50</title>
+<path fill="none" stroke="black" d="M730.44,-1191.83C750.38,-1138.14 782.76,-1063.52 833.6,-1015 920.62,-931.94 1040.98,-874.85 1146.09,-837.2"/>
+<polygon fill="black" stroke="black" points="1146.2,-837.16 1150.53,-831.38 1157.52,-833.16 1153.19,-838.93 1146.2,-837.16"/>
 </g>
-<!-- 53&#45;&gt;51 -->
-<g id="edge39" class="edge">
-<title>53&#45;&gt;51</title>
-<path fill="none" stroke="black" d="M3493.29,-1133.45C3514.65,-1079.78 3548.92,-1005.17 3600.68,-956.6 3687.15,-875.47 3805.44,-818.77 3909.02,-780.87"/>
-<polygon fill="black" stroke="black" points="3909.31,-780.76 3913.6,-774.96 3920.6,-776.69 3916.32,-782.49 3909.31,-780.76"/>
+<!-- 53&#45;&gt;50 -->
+<g id="edge33" class="edge">
+<title>53&#45;&gt;50</title>
+<path fill="none" stroke="black" d="M1683.97,-1597.41C1694.56,-1429.55 1700.9,-1115.06 1653.6,-1015 1639.97,-986.18 1621.13,-959.32 1599.61,-934.79"/>
+<polygon fill="black" stroke="black" points="1599.6,-934.77 1592.61,-932.99 1591.57,-925.85 1598.56,-927.63 1599.6,-934.77"/>
 </g>
-<!-- 54&#45;&gt;51 -->
-<g id="edge40" class="edge">
-<title>54&#45;&gt;51</title>
-<path fill="none" stroke="black" d="M3609.64,-1539.18C3603.28,-1393.81 3607.14,-1133.02 3727.68,-956.6 3772.44,-891.1 3841.3,-841.14 3909.91,-804.19"/>
-<polygon fill="black" stroke="black" points="3910.3,-803.98 3913.74,-797.64 3920.91,-798.37 3917.48,-804.71 3910.3,-803.98"/>
+<!-- 54&#45;&gt;50 -->
+<g id="edge34" class="edge">
+<title>54&#45;&gt;50</title>
+<path fill="none" stroke="black" d="M2035.7,-1597.61C2060.96,-1450.81 2077.54,-1186.78 1951.6,-1015 1870.01,-903.71 1726.67,-843.48 1603.25,-811.09"/>
+<polygon fill="black" stroke="black" points="1603,-811.03 1596.19,-813.41 1591.37,-808.04 1598.18,-805.66 1603,-811.03"/>
 </g>
-<!-- 55&#45;&gt;51 -->
-<g id="edge41" class="edge">
-<title>55&#45;&gt;51</title>
-<path fill="none" stroke="black" d="M3985.4,-1539.19C3979.17,-1401.53 3973.77,-1157.25 4025.68,-956.6 4027.84,-948.27 4030.3,-939.9 4033.03,-931.53"/>
-<polygon fill="black" stroke="black" points="4033.04,-931.49 4031.18,-924.52 4036.9,-920.12 4038.76,-927.09 4033.04,-931.49"/>
+<!-- 55&#45;&gt;50 -->
+<g id="edge35" class="edge">
+<title>55&#45;&gt;50</title>
+<path fill="none" stroke="black" d="M1379.38,-1580.56C1381.6,-1429.86 1381.94,-1173.98 1380.4,-990.88"/>
+<polygon fill="black" stroke="black" points="1380.4,-990.66 1376.35,-984.69 1380.3,-978.66 1384.35,-984.62 1380.4,-990.66"/>
 </g>
-<!-- 56&#45;&gt;51 -->
-<g id="edge42" class="edge">
-<title>56&#45;&gt;51</title>
-<path fill="none" stroke="black" d="M4790.28,-1522.3C4817.99,-1348.52 4849.94,-1044.99 4788.68,-956.6 4694.61,-820.86 4513.93,-761.55 4366.72,-735.7"/>
-<polygon fill="black" stroke="black" points="4366.67,-735.69 4360.08,-738.63 4354.84,-733.67 4361.43,-730.74 4366.67,-735.69"/>
+<!-- 56&#45;&gt;50 -->
+<g id="edge36" class="edge">
+<title>56&#45;&gt;50</title>
+<path fill="none" stroke="black" d="M547.51,-1538.69C538.01,-1360.74 531.7,-1093.79 592.6,-1015 661.11,-926.36 940.15,-856.32 1145.48,-815.16"/>
+<polygon fill="black" stroke="black" points="1145.58,-815.14 1150.69,-810.05 1157.35,-812.8 1152.25,-817.89 1145.58,-815.14"/>
+</g>
+<!-- 57&#45;&gt;50 -->
+<g id="edge37" class="edge">
+<title>57&#45;&gt;50</title>
+<path fill="none" stroke="black" d="M1510.45,-1200.28C1495.99,-1148.01 1471.88,-1067.47 1447.93,-990.44"/>
+<polygon fill="black" stroke="black" points="1447.82,-990.06 1442.21,-985.52 1444.25,-978.6 1449.85,-983.14 1447.82,-990.06"/>
 </g>
 <!-- 57&#45;&gt;51 -->
-<g id="edge43" class="edge">
+<g id="edge51" class="edge">
 <title>57&#45;&gt;51</title>
-<path fill="none" stroke="black" d="M4985.59,-1480.32C4956.39,-1301.29 4898.88,-1032.36 4828.68,-956.6 4709.76,-828.26 4518.22,-768.32 4366.91,-740.34"/>
-<polygon fill="black" stroke="black" points="4366.52,-740.27 4359.91,-743.14 4354.71,-738.14 4361.33,-735.27 4366.52,-740.27"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1494.37,-1317.1C1464.05,-1371.52 1411.94,-1452.21 1346.6,-1502.4 1311.45,-1529.4 1289.81,-1512.85 1253.6,-1538.4 1211.74,-1567.93 1174.3,-1612.23 1148.1,-1647.8"/>
+<polygon fill="black" stroke="black" points="1145.06,-1646.02 1142.02,-1656.17 1150.73,-1650.14 1145.06,-1646.02"/>
+</g>
+<!-- 57&#45;&gt;53 -->
+<g id="edge50" class="edge">
+<title>57&#45;&gt;53</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1542.92,-1317.52C1565.69,-1385.65 1604.1,-1500.57 1633.23,-1587.71"/>
+<polygon fill="black" stroke="black" points="1629.97,-1589.01 1636.46,-1597.38 1636.61,-1586.79 1629.97,-1589.01"/>
+</g>
+<!-- 58&#45;&gt;50 -->
+<g id="edge38" class="edge">
+<title>58&#45;&gt;50</title>
+<path fill="none" stroke="black" d="M1807.36,-1200.14C1788.22,-1148.02 1752.1,-1071.04 1704.6,-1015 1674.49,-979.49 1638.23,-946.11 1600.91,-916.18"/>
+<polygon fill="black" stroke="black" points="1600.81,-916.09 1593.62,-915.5 1591.41,-908.64 1598.59,-909.23 1600.81,-916.09"/>
 </g>
 <!-- 58&#45;&gt;51 -->
-<g id="edge44" class="edge">
+<g id="edge53" class="edge">
 <title>58&#45;&gt;51</title>
-<path fill="none" stroke="black" d="M3873.88,-1141.65C3899.88,-1091.67 3937.11,-1017.93 3974.68,-956.6 3979.94,-948.02 3985.39,-939.35 3990.99,-930.64"/>
-<polygon fill="black" stroke="black" points="3991.09,-930.48 3991,-923.27 3997.61,-920.41 3997.71,-927.62 3991.09,-930.48"/>
-</g>
-<!-- 58&#45;&gt;52 -->
-<g id="edge58" class="edge">
-<title>58&#45;&gt;52</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3868.91,-1258.7C3899.23,-1313.12 3951.34,-1393.81 4016.68,-1444 4051.83,-1471 4072.51,-1455.86 4109.68,-1480 4156.03,-1510.1 4200,-1554.63 4231.32,-1590.15"/>
-<polygon fill="black" stroke="black" points="4228.99,-1592.81 4238.2,-1598.04 4234.27,-1588.21 4228.99,-1592.81"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1797.12,-1317.24C1769.28,-1374.85 1717.96,-1460.76 1644.6,-1502.4 1492.83,-1588.54 1408.74,-1458.49 1253.6,-1538.4 1206.28,-1562.77 1167.89,-1609.94 1142.69,-1647.96"/>
+<polygon fill="black" stroke="black" points="1139.71,-1646.12 1137.2,-1656.42 1145.58,-1649.93 1139.71,-1646.12"/>
 </g>
 <!-- 58&#45;&gt;54 -->
-<g id="edge57" class="edge">
+<g id="edge52" class="edge">
 <title>58&#45;&gt;54</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3810.5,-1259.12C3776.04,-1327.39 3717.88,-1442.64 3673.87,-1529.84"/>
-<polygon fill="black" stroke="black" points="3670.63,-1528.48 3669.25,-1538.98 3676.88,-1531.63 3670.63,-1528.48"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1845.85,-1317.52C1874.46,-1385.72 1922.73,-1500.8 1959.3,-1587.97"/>
+<polygon fill="black" stroke="black" points="1956.15,-1589.52 1963.25,-1597.38 1962.6,-1586.81 1956.15,-1589.52"/>
+</g>
+<!-- 59&#45;&gt;50 -->
+<g id="edge39" class="edge">
+<title>59&#45;&gt;50</title>
+<path fill="none" stroke="black" d="M1247.85,-1200.28C1265.61,-1148.01 1291.15,-1067.47 1314.69,-990.44"/>
+<polygon fill="black" stroke="black" points="1314.8,-990.08 1312.72,-983.18 1318.3,-978.6 1320.38,-985.51 1314.8,-990.08"/>
 </g>
 <!-- 59&#45;&gt;51 -->
-<g id="edge45" class="edge">
+<g id="edge55" class="edge">
 <title>59&#45;&gt;51</title>
-<path fill="none" stroke="black" d="M4142.24,-1141.88C4143.88,-1089.72 4144.6,-1009.4 4144.4,-932.51"/>
-<polygon fill="black" stroke="black" points="4144.4,-932.2 4140.38,-926.22 4144.36,-920.2 4148.38,-926.19 4144.4,-932.2"/>
-</g>
-<!-- 59&#45;&gt;52 -->
-<g id="edge60" class="edge">
-<title>59&#45;&gt;52</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4155.84,-1259.12C4182.59,-1344.31 4232.32,-1502.66 4259.24,-1588.36"/>
-<polygon fill="black" stroke="black" points="4255.91,-1589.45 4262.24,-1597.94 4262.59,-1587.35 4255.91,-1589.45"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1210.55,-1317.52C1188.41,-1402.62 1147.26,-1560.74 1124.95,-1646.5"/>
+<polygon fill="black" stroke="black" points="1121.52,-1645.78 1122.39,-1656.34 1128.29,-1647.54 1121.52,-1645.78"/>
 </g>
 <!-- 59&#45;&gt;55 -->
-<g id="edge59" class="edge">
+<g id="edge54" class="edge">
 <title>59&#45;&gt;55</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4118.35,-1259.12C4095.59,-1327.25 4057.17,-1442.17 4028.05,-1529.31"/>
-<polygon fill="black" stroke="black" points="4024.67,-1528.39 4024.82,-1538.98 4031.31,-1530.61 4024.67,-1528.39"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1244.92,-1317.52C1266.27,-1381.38 1301.35,-1486.36 1329.65,-1571.03"/>
+<polygon fill="black" stroke="black" points="1326.4,-1572.35 1332.89,-1580.72 1333.04,-1570.13 1326.4,-1572.35"/>
+</g>
+<!-- 60&#45;&gt;50 -->
+<g id="edge40" class="edge">
+<title>60&#45;&gt;50</title>
+<path fill="none" stroke="black" d="M974.34,-1200.19C997.72,-1148.29 1033.95,-1071.61 1080.6,-1015 1100.95,-990.29 1124.23,-966.45 1148.57,-943.99"/>
+<polygon fill="black" stroke="black" points="1148.71,-943.87 1150.46,-936.87 1157.59,-935.79 1155.84,-942.78 1148.71,-943.87"/>
 </g>
 <!-- 60&#45;&gt;51 -->
-<g id="edge46" class="edge">
+<g id="edge57" class="edge">
 <title>60&#45;&gt;51</title>
-<path fill="none" stroke="black" d="M4396.73,-1141.63C4373.94,-1091.95 4336.55,-1018.67 4300.68,-956.6 4295.73,-948.03 4290.62,-939.34 4285.39,-930.59"/>
-<polygon fill="black" stroke="black" points="4285.39,-930.59 4278.87,-927.51 4279.21,-920.3 4285.73,-923.38 4285.39,-930.59"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M966.87,-1317.52C998.21,-1402.71 1056.46,-1561.06 1087.99,-1646.76"/>
+<polygon fill="black" stroke="black" points="1084.77,-1648.16 1091.51,-1656.34 1091.34,-1645.75 1084.77,-1648.16"/>
+</g>
+<!-- 60&#45;&gt;56 -->
+<g id="edge56" class="edge">
+<title>60&#45;&gt;56</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M925.93,-1317.29C906.18,-1369.43 872.04,-1446.42 825.6,-1502.4 783.65,-1552.97 726.71,-1598.17 675.94,-1633.02"/>
+<polygon fill="black" stroke="black" points="673.83,-1630.22 667.52,-1638.74 677.76,-1636.01 673.83,-1630.22"/>
+</g>
+<!-- 61&#45;&gt;62 -->
+<g id="edge59" class="edge">
+<title>61&#45;&gt;62</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4163.68,-844.33C4162.53,-887.56 4161.92,-945.92 4161.85,-1005.15"/>
+<polygon fill="black" stroke="black" points="4158.35,-1005.44 4161.85,-1015.44 4165.35,-1005.44 4158.35,-1005.44"/>
 </g>
-<!-- 60&#45;&gt;52 -->
+<!-- 62&#45;&gt;24 -->
 <g id="edge62" class="edge">
-<title>60&#45;&gt;52</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4399.52,-1259.12C4372.77,-1344.31 4323.04,-1502.66 4296.13,-1588.36"/>
-<polygon fill="black" stroke="black" points="4292.78,-1587.35 4293.12,-1597.94 4299.46,-1589.45 4292.78,-1587.35"/>
+<title>62&#45;&gt;24</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4095.71,-1502.17C4079.54,-1555.97 4063.83,-1608.24 4052.39,-1646.31"/>
+<polygon fill="black" stroke="black" points="4048.95,-1645.58 4049.43,-1656.17 4055.66,-1647.6 4048.95,-1645.58"/>
 </g>
-<!-- 60&#45;&gt;56 -->
+<!-- 62&#45;&gt;36 -->
 <g id="edge61" class="edge">
-<title>60&#45;&gt;56</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4438.79,-1258.74C4459.34,-1310.25 4493.87,-1386.38 4537.68,-1444 4568.23,-1484.19 4607.56,-1522.64 4644.88,-1555.07"/>
-<polygon fill="black" stroke="black" points="4642.94,-1558.02 4652.81,-1561.9 4647.51,-1552.72 4642.94,-1558.02"/>
+<title>62&#45;&gt;36</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4429.81,-1495.9C4432.74,-1498.09 4435.67,-1500.26 4438.6,-1502.4 4531.22,-1570.24 4647.96,-1635.09 4719.12,-1672.57"/>
+<polygon fill="black" stroke="black" points="4717.51,-1675.68 4728,-1677.22 4720.77,-1669.48 4717.51,-1675.68"/>
 </g>
-<!-- 61&#45;&gt;51 -->
-<g id="edge47" class="edge">
-<title>61&#45;&gt;51</title>
-<path fill="none" stroke="black" d="M4647.77,-1141.81C4631.07,-1088.85 4597.38,-1010.52 4547.68,-956.6 4496.66,-901.25 4430,-854.42 4365.29,-817.2"/>
-<polygon fill="black" stroke="black" points="4364.94,-817 4357.75,-817.51 4354.51,-811.07 4361.7,-810.55 4364.94,-817"/>
-</g>
-<!-- 61&#45;&gt;52 -->
-<g id="edge64" class="edge">
-<title>61&#45;&gt;52</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4638.8,-1258.71C4618.9,-1310.73 4584.66,-1387.64 4538.68,-1444 4490.53,-1503.01 4422.2,-1555.4 4367.53,-1592.19"/>
-<polygon fill="black" stroke="black" points="4365.26,-1589.49 4358.88,-1597.95 4369.15,-1595.32 4365.26,-1589.49"/>
-</g>
-<!-- 61&#45;&gt;57 -->
-<g id="edge63" class="edge">
-<title>61&#45;&gt;57</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4707.33,-1258.93C4754.02,-1314.72 4826.05,-1402.07 4885.68,-1480 4886.36,-1480.89 4887.04,-1481.78 4887.72,-1482.67"/>
-<polygon fill="black" stroke="black" points="4885.04,-1484.93 4893.88,-1490.78 4890.62,-1480.7 4885.04,-1484.93"/>
+<!-- 62&#45;&gt;61 -->
+<g id="edge58" class="edge">
+<title>62&#45;&gt;61</title>
+<path fill="none" stroke="black" d="M4175.35,-1015.44C4175.34,-958.11 4174.83,-900.83 4173.82,-856.49"/>
+<polygon fill="black" stroke="black" points="4173.81,-856.33 4169.67,-850.43 4173.52,-844.33 4177.66,-850.23 4173.81,-856.33"/>
+</g>
+<!-- 63 -->
+<g id="node25" class="node">
+<title>63</title>
+<polygon fill="#f2f2f2" stroke="black" points="4187.87,-1656.5 4187.87,-1756.5 4417.32,-1756.5 4417.32,-1656.5 4187.87,-1656.5"/>
+<text text-anchor="middle" x="4302.6" y="-1739.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
+<text text-anchor="middle" x="4302.6" y="-1723.1" font-family="Times,serif" font-size="14.00">IRegistry</text>
+<text text-anchor="middle" x="4302.6" y="-1706.3" font-family="Times,serif" font-size="14.00">contracts/registries/IRegistry.sol</text>
+<polyline fill="none" stroke="black" points="4187.87,-1698.1 4417.32,-1698.1 "/>
+<text text-anchor="start" x="4195.87" y="-1681.5" font-family="Times,serif" font-size="14.00">External:</text>
+<text text-anchor="start" x="4195.87" y="-1664.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;isRegistered(_entry: address): bool</text>
 </g>
 <!-- 62&#45;&gt;63 -->
-<g id="edge66" class="edge">
+<g id="edge60" class="edge">
 <title>62&#45;&gt;63</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1049.76,-785.93C1048.61,-829.16 1048,-887.52 1047.94,-946.75"/>
-<polygon fill="black" stroke="black" points="1044.44,-947.04 1047.93,-957.04 1051.44,-947.04 1044.44,-947.04"/>
-</g>
-<!-- 63&#45;&gt;27 -->
-<g id="edge69" class="edge">
-<title>63&#45;&gt;27</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M981.8,-1443.77C965.63,-1497.57 949.92,-1549.84 938.47,-1587.91"/>
-<polygon fill="black" stroke="black" points="935.04,-1587.18 935.51,-1597.77 941.74,-1589.2 935.04,-1587.18"/>
-</g>
-<!-- 63&#45;&gt;37 -->
-<g id="edge68" class="edge">
-<title>63&#45;&gt;37</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1315.86,-1261.13C1744.15,-1359.25 2578.7,-1550.43 2884.66,-1620.52"/>
-<polygon fill="black" stroke="black" points="2883.91,-1623.94 2894.44,-1622.76 2885.47,-1617.12 2883.91,-1623.94"/>
-</g>
-<!-- 63&#45;&gt;62 -->
-<g id="edge65" class="edge">
-<title>63&#45;&gt;62</title>
-<path fill="none" stroke="black" d="M1061.43,-957.04C1061.43,-899.71 1060.92,-842.43 1059.9,-798.09"/>
-<polygon fill="black" stroke="black" points="1059.9,-797.93 1055.75,-792.03 1059.6,-785.93 1063.75,-791.83 1059.9,-797.93"/>
-</g>
-<!-- 64 -->
-<g id="node27" class="node">
-<title>64</title>
-<polygon fill="#f2f2f2" stroke="black" points="1073.96,-1598.1 1073.96,-1698.1 1303.41,-1698.1 1303.41,-1598.1 1073.96,-1598.1"/>
-<text text-anchor="middle" x="1188.68" y="-1681.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
-<text text-anchor="middle" x="1188.68" y="-1664.7" font-family="Times,serif" font-size="14.00">IRegistry</text>
-<text text-anchor="middle" x="1188.68" y="-1647.9" font-family="Times,serif" font-size="14.00">contracts/registries/IRegistry.sol</text>
-<polyline fill="none" stroke="black" points="1073.96,-1639.7 1303.41,-1639.7 "/>
-<text text-anchor="start" x="1081.96" y="-1623.1" font-family="Times,serif" font-size="14.00">External:</text>
-<text text-anchor="start" x="1081.96" y="-1606.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;isRegistered(_entry: address): bool</text>
-</g>
-<!-- 63&#45;&gt;64 -->
-<g id="edge67" class="edge">
-<title>63&#45;&gt;64</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1127.56,-1443.77C1143.74,-1497.57 1159.45,-1549.84 1170.89,-1587.91"/>
-<polygon fill="black" stroke="black" points="1167.62,-1589.2 1173.85,-1597.77 1174.33,-1587.18 1167.62,-1589.2"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4241.48,-1502.17C4257.65,-1555.97 4273.36,-1608.24 4284.81,-1646.31"/>
+<polygon fill="black" stroke="black" points="4281.54,-1647.6 4287.77,-1656.17 4288.24,-1645.58 4281.54,-1647.6"/>
 </g>
 </g>
 </svg>
diff --git a/docs/uml/class-uml-IexecPocoFacets.svg b/docs/uml/class-uml-IexecPocoFacets.svg
index 2b01ae3df..49bedeb83 100644
--- a/docs/uml/class-uml-IexecPocoFacets.svg
+++ b/docs/uml/class-uml-IexecPocoFacets.svg
@@ -4,1106 +4,1053 @@
 <!-- Generated by graphviz version 5.0.0 (20220707.1540)
  -->
 <!-- Title: UmlClassDiagram Pages: 1 -->
-<svg width="6449pt" height="2194pt"
- viewBox="0.00 0.00 6448.56 2193.80" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="6824pt" height="2194pt"
+ viewBox="0.00 0.00 6823.61 2193.80" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 2189.8)">
 <title>UmlClassDiagram</title>
-<polygon fill="white" stroke="transparent" points="-4,4 -4,-2189.8 6444.56,-2189.8 6444.56,4 -4,4"/>
+<polygon fill="white" stroke="transparent" points="-4,4 -4,-2189.8 6819.61,-2189.8 6819.61,4 -4,4"/>
 <!-- 3 -->
 <g id="node1" class="node">
 <title>3</title>
-<polygon fill="#f2f2f2" stroke="black" points="1864.5,-929.7 1864.5,-1239.3 2173.7,-1239.3 2173.7,-929.7 1864.5,-929.7"/>
-<text text-anchor="middle" x="2019.1" y="-1222.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Abstract&gt;&gt;</text>
-<text text-anchor="middle" x="2019.1" y="-1205.9" font-family="Times,serif" font-size="14.00">FacetBase</text>
-<text text-anchor="middle" x="2019.1" y="-1189.1" font-family="Times,serif" font-size="14.00">contracts/abstract/FacetBase.sol</text>
-<polyline fill="none" stroke="black" points="1864.5,-1180.9 2173.7,-1180.9 "/>
-<text text-anchor="start" x="1872.5" y="-1164.3" font-family="Times,serif" font-size="14.00">Internal:</text>
-<text text-anchor="start" x="1872.5" y="-1147.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;CONTRIBUTION_DEADLINE_RATIO: uint256</text>
-<text text-anchor="start" x="1872.5" y="-1130.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;REVEAL_DEADLINE_RATIO: uint256</text>
-<text text-anchor="start" x="1872.5" y="-1113.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;FINAL_DEADLINE_RATIO: uint256</text>
-<text text-anchor="start" x="1872.5" y="-1097.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;WORKERPOOL_STAKE_RATIO: uint256</text>
-<text text-anchor="start" x="1872.5" y="-1080.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;KITTY_RATIO: uint256</text>
-<text text-anchor="start" x="1872.5" y="-1063.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;KITTY_MIN: uint256</text>
-<text text-anchor="start" x="1872.5" y="-1046.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;KITTY_ADDRESS: address</text>
-<text text-anchor="start" x="1872.5" y="-1029.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;GROUPMEMBER_PURPOSE: uint256</text>
-<polyline fill="none" stroke="black" points="1864.5,-1021.7 2173.7,-1021.7 "/>
-<text text-anchor="start" x="1872.5" y="-1005.1" font-family="Times,serif" font-size="14.00">Internal:</text>
-<text text-anchor="start" x="1872.5" y="-988.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;owner(): address</text>
-<text text-anchor="start" x="1872.5" y="-971.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_msgSender(): address</text>
-<text text-anchor="start" x="1872.5" y="-954.7" font-family="Times,serif" font-size="14.00">Public:</text>
-<text text-anchor="start" x="1872.5" y="-937.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;modifier&gt;&gt; onlyOwner()</text>
-</g>
-<!-- 4 -->
+<polygon fill="#f2f2f2" stroke="black" points="5182.01,-477.9 5182.01,-787.5 5491.21,-787.5 5491.21,-477.9 5182.01,-477.9"/>
+<text text-anchor="middle" x="5336.61" y="-770.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Abstract&gt;&gt;</text>
+<text text-anchor="middle" x="5336.61" y="-754.1" font-family="Times,serif" font-size="14.00">FacetBase</text>
+<text text-anchor="middle" x="5336.61" y="-737.3" font-family="Times,serif" font-size="14.00">contracts/abstract/FacetBase.sol</text>
+<polyline fill="none" stroke="black" points="5182.01,-729.1 5491.21,-729.1 "/>
+<text text-anchor="start" x="5190.01" y="-712.5" font-family="Times,serif" font-size="14.00">Internal:</text>
+<text text-anchor="start" x="5190.01" y="-695.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;CONTRIBUTION_DEADLINE_RATIO: uint256</text>
+<text text-anchor="start" x="5190.01" y="-678.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;REVEAL_DEADLINE_RATIO: uint256</text>
+<text text-anchor="start" x="5190.01" y="-662.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;FINAL_DEADLINE_RATIO: uint256</text>
+<text text-anchor="start" x="5190.01" y="-645.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;WORKERPOOL_STAKE_RATIO: uint256</text>
+<text text-anchor="start" x="5190.01" y="-628.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;KITTY_RATIO: uint256</text>
+<text text-anchor="start" x="5190.01" y="-611.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;KITTY_MIN: uint256</text>
+<text text-anchor="start" x="5190.01" y="-594.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;KITTY_ADDRESS: address</text>
+<text text-anchor="start" x="5190.01" y="-578.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;GROUPMEMBER_PURPOSE: uint256</text>
+<polyline fill="none" stroke="black" points="5182.01,-569.9 5491.21,-569.9 "/>
+<text text-anchor="start" x="5190.01" y="-553.3" font-family="Times,serif" font-size="14.00">Internal:</text>
+<text text-anchor="start" x="5190.01" y="-536.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;owner(): address</text>
+<text text-anchor="start" x="5190.01" y="-519.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_msgSender(): address</text>
+<text text-anchor="start" x="5190.01" y="-502.9" font-family="Times,serif" font-size="14.00">Public:</text>
+<text text-anchor="start" x="5190.01" y="-486.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;modifier&gt;&gt; onlyOwner()</text>
+</g>
+<!-- 10 -->
 <g id="node2" class="node">
-<title>4</title>
-<polygon fill="#f2f2f2" stroke="black" points="1329.63,-540.7 1329.63,-724.7 1714.57,-724.7 1714.57,-540.7 1329.63,-540.7"/>
-<text text-anchor="middle" x="1522.1" y="-708.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Abstract&gt;&gt;</text>
-<text text-anchor="middle" x="1522.1" y="-691.3" font-family="Times,serif" font-size="14.00">IexecEscrow</text>
-<text text-anchor="middle" x="1522.1" y="-674.5" font-family="Times,serif" font-size="14.00">contracts/abstract/IexecEscrow.sol</text>
-<polyline fill="none" stroke="black" points="1329.63,-666.3 1714.57,-666.3 "/>
-<text text-anchor="start" x="1337.63" y="-649.7" font-family="Times,serif" font-size="14.00">Internal:</text>
-<text text-anchor="start" x="1337.63" y="-632.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;lock(account: address, value: uint256)</text>
-<text text-anchor="start" x="1337.63" y="-616.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;unlock(account: address, value: uint256)</text>
-<text text-anchor="start" x="1337.63" y="-599.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;reward(account: address, value: uint256, ref: bytes32)</text>
-<text text-anchor="start" x="1337.63" y="-582.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;seize(account: address, value: uint256, ref: bytes32)</text>
-<text text-anchor="start" x="1337.63" y="-565.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;rewardAndLock(account: address, value: uint256, ref: bytes32)</text>
-<text text-anchor="start" x="1337.63" y="-548.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_transfer(from: address, to: address, value: uint256)</text>
-</g>
-<!-- 4&#45;&gt;3 -->
-<g id="edge1" class="edge">
-<title>4&#45;&gt;3</title>
-<path fill="none" stroke="black" d="M1595.71,-724.82C1631.38,-764.78 1676.7,-809.96 1724.1,-842.8 1757.15,-865.7 1773.66,-856.48 1807.1,-878.8 1821.48,-888.4 1835.76,-899.03 1849.71,-910.25"/>
-<polygon fill="none" stroke="black" points="1843.1,-918.41 1872.84,-929.63 1856.58,-902.31 1843.1,-918.41"/>
+<title>10</title>
+<polygon fill="#f2f2f2" stroke="black" points="2489.4,-532.3 2489.4,-733.1 2711.81,-733.1 2711.81,-532.3 2489.4,-532.3"/>
+<text text-anchor="middle" x="2600.61" y="-716.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="2600.61" y="-699.7" font-family="Times,serif" font-size="14.00">Matching</text>
+<text text-anchor="middle" x="2600.61" y="-682.9" font-family="Times,serif" font-size="14.00">contracts/facets/IexecPoco1Facet.sol</text>
+<polyline fill="none" stroke="black" points="2489.4,-674.7 2711.81,-674.7 "/>
+<text text-anchor="start" x="2497.4" y="-658.1" font-family="Times,serif" font-size="14.00">apporderHash: bytes32</text>
+<text text-anchor="start" x="2497.4" y="-641.3" font-family="Times,serif" font-size="14.00">appOwner: address</text>
+<text text-anchor="start" x="2497.4" y="-624.5" font-family="Times,serif" font-size="14.00">datasetorderHash: bytes32</text>
+<text text-anchor="start" x="2497.4" y="-607.7" font-family="Times,serif" font-size="14.00">datasetOwner: address</text>
+<text text-anchor="start" x="2497.4" y="-590.9" font-family="Times,serif" font-size="14.00">workerpoolorderHash: bytes32</text>
+<text text-anchor="start" x="2497.4" y="-574.1" font-family="Times,serif" font-size="14.00">workerpoolOwner: address</text>
+<text text-anchor="start" x="2497.4" y="-557.3" font-family="Times,serif" font-size="14.00">requestorderHash: bytes32</text>
+<text text-anchor="start" x="2497.4" y="-540.5" font-family="Times,serif" font-size="14.00">hasDataset: bool</text>
+</g>
+<!-- 11 -->
+<g id="node3" class="node">
+<title>11</title>
+<polygon fill="#f2f2f2" stroke="black" points="1648.58,-84.5 1648.58,-302.1 3044.64,-302.1 3044.64,-84.5 1648.58,-84.5"/>
+<text text-anchor="middle" x="2346.61" y="-285.5" font-family="Times,serif" font-size="14.00">IexecPoco1Facet</text>
+<text text-anchor="middle" x="2346.61" y="-268.7" font-family="Times,serif" font-size="14.00">contracts/facets/IexecPoco1Facet.sol</text>
+<polyline fill="none" stroke="black" points="1648.58,-260.5 3044.64,-260.5 "/>
+<text text-anchor="start" x="1656.58" y="-243.9" font-family="Times,serif" font-size="14.00">Private:</text>
+<text text-anchor="start" x="1656.58" y="-227.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_matchOrders(_apporder: IexecLibOrders_v5.AppOrder, _datasetorder: IexecLibOrders_v5.DatasetOrder, _workerpoolorder: IexecLibOrders_v5.WorkerpoolOrder, _requestorder: IexecLibOrders_v5.RequestOrder, _sponsor: address): bytes32</text>
+<text text-anchor="start" x="1656.58" y="-210.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_ignoreTeeFramework(tag: bytes32): bytes32</text>
+<text text-anchor="start" x="1656.58" y="-193.5" font-family="Times,serif" font-size="14.00">External:</text>
+<text text-anchor="start" x="1656.58" y="-176.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;verifySignature(_identity: address, _hash: bytes32, _signature: bytes): bool</text>
+<text text-anchor="start" x="1656.58" y="-159.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;verifyPresignature(_identity: address, _hash: bytes32): bool</text>
+<text text-anchor="start" x="1656.58" y="-143.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;verifyPresignatureOrSignature(_identity: address, _hash: bytes32, _signature: bytes): bool</text>
+<text text-anchor="start" x="1656.58" y="-126.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;assertDatasetDealCompatibility(datasetOrder: IexecLibOrders_v5.DatasetOrder, dealId: bytes32)</text>
+<text text-anchor="start" x="1656.58" y="-109.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;matchOrders(_apporder: IexecLibOrders_v5.AppOrder, _datasetorder: IexecLibOrders_v5.DatasetOrder, _workerpoolorder: IexecLibOrders_v5.WorkerpoolOrder, _requestorder: IexecLibOrders_v5.RequestOrder): bytes32</text>
+<text text-anchor="start" x="1656.58" y="-92.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;sponsorMatchOrders(_apporder: IexecLibOrders_v5.AppOrder, _datasetorder: IexecLibOrders_v5.DatasetOrder, _workerpoolorder: IexecLibOrders_v5.WorkerpoolOrder, _requestorder: IexecLibOrders_v5.RequestOrder): bytes32</text>
+</g>
+<!-- 11&#45;&gt;3 -->
+<g id="edge3" class="edge">
+<title>11&#45;&gt;3</title>
+<path fill="none" stroke="black" d="M3045,-222.16C3819.48,-257.56 4984.51,-325.9 5167.61,-422.6 5184.88,-431.72 5201.01,-443.44 5215.93,-456.68"/>
+<polygon fill="none" stroke="black" points="5208.79,-464.38 5237.61,-477.77 5223.43,-449.33 5208.79,-464.38"/>
 </g>
-<!-- 25 -->
-<g id="node8" class="node">
-<title>25</title>
-<polygon fill="#f2f2f2" stroke="black" points="1330.42,-992.5 1330.42,-1176.5 1759.78,-1176.5 1759.78,-992.5 1330.42,-992.5"/>
-<text text-anchor="middle" x="1545.1" y="-1159.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
-<text text-anchor="middle" x="1545.1" y="-1143.1" font-family="Times,serif" font-size="14.00">IexecEscrowEvents</text>
-<text text-anchor="middle" x="1545.1" y="-1126.3" font-family="Times,serif" font-size="14.00">contracts/interfaces/IexecEscrowEvents.sol</text>
-<polyline fill="none" stroke="black" points="1330.42,-1118.1 1759.78,-1118.1 "/>
-<text text-anchor="start" x="1338.42" y="-1101.5" font-family="Times,serif" font-size="14.00">Public:</text>
-<text text-anchor="start" x="1338.42" y="-1084.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Transfer(from: address, to: address, value: uint256)</text>
-<text text-anchor="start" x="1338.42" y="-1067.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Approval(owner: address, spender: address, value: uint256)</text>
-<text text-anchor="start" x="1338.42" y="-1051.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Reward(owner: address, amount: uint256, ref: bytes32)</text>
-<text text-anchor="start" x="1338.42" y="-1034.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Seize(owner: address, amount: uint256, ref: bytes32)</text>
-<text text-anchor="start" x="1338.42" y="-1017.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Lock(owner: address, amount: uint256)</text>
-<text text-anchor="start" x="1338.42" y="-1000.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Unlock(owner: address, amount: uint256)</text>
-</g>
-<!-- 4&#45;&gt;25 -->
-<g id="edge2" class="edge">
-<title>4&#45;&gt;25</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1526.75,-724.72C1530.25,-793.05 1535.07,-887.29 1538.89,-962.04"/>
-<polygon fill="none" stroke="black" points="1528.41,-962.8 1540.43,-992.23 1549.39,-961.73 1528.41,-962.8"/>
+<!-- 11&#45;&gt;10 -->
+<g id="edge14" class="edge">
+<title>11&#45;&gt;10</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2409.59,-302.27C2431.75,-340.29 2456.81,-383.33 2479.61,-422.6 2498.57,-455.26 2519.16,-490.81 2537.89,-523.18"/>
+<polygon fill="black" stroke="black" points="2535.08,-525.31 2543.12,-532.22 2541.14,-521.81 2535.08,-525.31"/>
 </g>
-<!-- 62 -->
-<g id="node32" class="node">
-<title>62</title>
-<polygon fill="#f2f2f2" stroke="black" points="2191.66,-1013.7 2191.66,-1155.3 2456.55,-1155.3 2456.55,-1013.7 2191.66,-1013.7"/>
-<text text-anchor="middle" x="2324.1" y="-1138.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
-<text text-anchor="middle" x="2324.1" y="-1121.9" font-family="Times,serif" font-size="14.00">PocoStorageLib</text>
-<text text-anchor="middle" x="2324.1" y="-1105.1" font-family="Times,serif" font-size="14.00">contracts/libs/PocoStorageLib.sol</text>
-<polyline fill="none" stroke="black" points="2191.66,-1096.9 2456.55,-1096.9 "/>
-<text text-anchor="start" x="2199.66" y="-1080.3" font-family="Times,serif" font-size="14.00">Private:</text>
-<text text-anchor="start" x="2199.66" y="-1063.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;POCO_STORAGE_LOCATION: bytes32</text>
-<polyline fill="none" stroke="black" points="2191.66,-1055.3 2456.55,-1055.3 "/>
-<text text-anchor="start" x="2199.66" y="-1038.7" font-family="Times,serif" font-size="14.00">Internal:</text>
-<text text-anchor="start" x="2199.66" y="-1021.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;getPocoStorage(): ($: PocoStorage)</text>
-</g>
-<!-- 4&#45;&gt;62 -->
-<g id="edge3" class="edge">
-<title>4&#45;&gt;62</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1585.07,-724.82C1620.51,-768.42 1668.74,-816.71 1724.1,-842.8 1816.65,-886.42 2094.46,-827.7 2183.1,-878.8 2231.89,-906.93 2267.58,-959.58 2290.85,-1004.44"/>
-<polygon fill="black" stroke="black" points="2287.84,-1006.24 2295.48,-1013.59 2294.08,-1003.08 2287.84,-1006.24"/>
+<!-- 26 -->
+<g id="node6" class="node">
+<title>26</title>
+<polygon fill="#f2f2f2" stroke="black" points="772.12,-507.1 772.12,-758.3 1763.1,-758.3 1763.1,-507.1 772.12,-507.1"/>
+<text text-anchor="middle" x="1267.61" y="-741.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
+<text text-anchor="middle" x="1267.61" y="-724.9" font-family="Times,serif" font-size="14.00">IexecPoco1</text>
+<text text-anchor="middle" x="1267.61" y="-708.1" font-family="Times,serif" font-size="14.00">contracts/interfaces/IexecPoco1.sol</text>
+<polyline fill="none" stroke="black" points="772.12,-699.9 1763.1,-699.9 "/>
+<text text-anchor="start" x="780.12" y="-683.3" font-family="Times,serif" font-size="14.00">External:</text>
+<text text-anchor="start" x="780.12" y="-666.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;verifySignature(address, bytes32, bytes): bool</text>
+<text text-anchor="start" x="780.12" y="-649.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;verifyPresignature(address, bytes32): bool</text>
+<text text-anchor="start" x="780.12" y="-632.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;verifyPresignatureOrSignature(address, bytes32, bytes): bool</text>
+<text text-anchor="start" x="780.12" y="-616.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;assertDatasetDealCompatibility(datasetOrder: IexecLibOrders_v5.DatasetOrder, dealId: bytes32)</text>
+<text text-anchor="start" x="780.12" y="-599.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;matchOrders(IexecLibOrders_v5.AppOrder, IexecLibOrders_v5.DatasetOrder, IexecLibOrders_v5.WorkerpoolOrder, IexecLibOrders_v5.RequestOrder): bytes32</text>
+<text text-anchor="start" x="780.12" y="-582.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;sponsorMatchOrders(IexecLibOrders_v5.AppOrder, IexecLibOrders_v5.DatasetOrder, IexecLibOrders_v5.WorkerpoolOrder, IexecLibOrders_v5.RequestOrder): bytes32</text>
+<text text-anchor="start" x="780.12" y="-565.7" font-family="Times,serif" font-size="14.00">Public:</text>
+<text text-anchor="start" x="780.12" y="-548.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; SchedulerNotice(workerpool: address, dealid: bytes32)</text>
+<text text-anchor="start" x="780.12" y="-532.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; OrdersMatched(dealid: bytes32, appHash: bytes32, datasetHash: bytes32, workerpoolHash: bytes32, requestHash: bytes32, volume: uint256)</text>
+<text text-anchor="start" x="780.12" y="-515.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; DealSponsored(dealId: bytes32, sponsor: address)</text>
+</g>
+<!-- 11&#45;&gt;26 -->
+<g id="edge1" class="edge">
+<title>11&#45;&gt;26</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2076.04,-302.1C1981.26,-340.02 1874.16,-383.03 1776.61,-422.6 1718.81,-446.05 1657.39,-471.13 1597.95,-495.5"/>
+<polygon fill="none" stroke="black" points="1593.66,-485.91 1569.89,-507.01 1601.63,-505.34 1593.66,-485.91"/>
 </g>
-<!-- 63 -->
-<g id="node33" class="node">
-<title>63</title>
-<polygon fill="#f2f2f2" stroke="black" points="2063.13,-1326.7 2063.13,-1813.1 2585.07,-1813.1 2585.07,-1326.7 2063.13,-1326.7"/>
-<text text-anchor="middle" x="2324.1" y="-1796.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="2324.1" y="-1779.7" font-family="Times,serif" font-size="14.00">PocoStorage</text>
-<text text-anchor="middle" x="2324.1" y="-1762.9" font-family="Times,serif" font-size="14.00">contracts/libs/PocoStorageLib.sol</text>
-<polyline fill="none" stroke="black" points="2063.13,-1754.7 2585.07,-1754.7 "/>
-<text text-anchor="start" x="2071.13" y="-1738.1" font-family="Times,serif" font-size="14.00">m_appregistry: IRegistry</text>
-<text text-anchor="start" x="2071.13" y="-1721.3" font-family="Times,serif" font-size="14.00">m_datasetregistry: IRegistry</text>
-<text text-anchor="start" x="2071.13" y="-1704.5" font-family="Times,serif" font-size="14.00">m_workerpoolregistry: IRegistry</text>
-<text text-anchor="start" x="2071.13" y="-1687.7" font-family="Times,serif" font-size="14.00">m_baseToken: IERC20</text>
-<text text-anchor="start" x="2071.13" y="-1670.9" font-family="Times,serif" font-size="14.00">m_name: string</text>
-<text text-anchor="start" x="2071.13" y="-1654.1" font-family="Times,serif" font-size="14.00">m_symbol: string</text>
-<text text-anchor="start" x="2071.13" y="-1637.3" font-family="Times,serif" font-size="14.00">m_decimals: uint8</text>
-<text text-anchor="start" x="2071.13" y="-1620.5" font-family="Times,serif" font-size="14.00">m_totalSupply: uint256</text>
-<text text-anchor="start" x="2071.13" y="-1603.7" font-family="Times,serif" font-size="14.00">m_balances: mapping(address=&gt;uint256)</text>
-<text text-anchor="start" x="2071.13" y="-1586.9" font-family="Times,serif" font-size="14.00">m_frozens: mapping(address=&gt;uint256)</text>
-<text text-anchor="start" x="2071.13" y="-1570.1" font-family="Times,serif" font-size="14.00">m_allowances: mapping(address=&gt;mapping(address=&gt;uint256))</text>
-<text text-anchor="start" x="2071.13" y="-1553.3" font-family="Times,serif" font-size="14.00">m_eip712DomainSeparator: bytes32</text>
-<text text-anchor="start" x="2071.13" y="-1536.5" font-family="Times,serif" font-size="14.00">m_presigned: mapping(bytes32=&gt;address)</text>
-<text text-anchor="start" x="2071.13" y="-1519.7" font-family="Times,serif" font-size="14.00">m_consumed: mapping(bytes32=&gt;uint256)</text>
-<text text-anchor="start" x="2071.13" y="-1502.9" font-family="Times,serif" font-size="14.00">m_deals: mapping(bytes32=&gt;IexecLibCore_v5.Deal)</text>
-<text text-anchor="start" x="2071.13" y="-1486.1" font-family="Times,serif" font-size="14.00">m_tasks: mapping(bytes32=&gt;IexecLibCore_v5.Task)</text>
-<text text-anchor="start" x="2071.13" y="-1469.3" font-family="Times,serif" font-size="14.00">m_consensus: mapping(bytes32=&gt;IexecLibCore_v5.Consensus)</text>
-<text text-anchor="start" x="2071.13" y="-1452.5" font-family="Times,serif" font-size="14.00">m_contributions: mapping(bytes32=&gt;mapping(address=&gt;IexecLibCore_v5.Contribution))</text>
-<text text-anchor="start" x="2071.13" y="-1435.7" font-family="Times,serif" font-size="14.00">m_workerScores: mapping(address=&gt;uint256)</text>
-<text text-anchor="start" x="2071.13" y="-1418.9" font-family="Times,serif" font-size="14.00">m_teebroker: address</text>
-<text text-anchor="start" x="2071.13" y="-1402.1" font-family="Times,serif" font-size="14.00">m_callbackgas: uint256</text>
-<text text-anchor="start" x="2071.13" y="-1385.3" font-family="Times,serif" font-size="14.00">m_categories: IexecLibCore_v5.Category[]</text>
-<text text-anchor="start" x="2071.13" y="-1368.5" font-family="Times,serif" font-size="14.00">m_v3_iexecHub: IexecHubV3Interface</text>
-<text text-anchor="start" x="2071.13" y="-1351.7" font-family="Times,serif" font-size="14.00">m_v3_scoreImported: mapping(address=&gt;bool)</text>
-<text text-anchor="start" x="2071.13" y="-1334.9" font-family="Times,serif" font-size="14.00">m_dealsBoost: mapping(bytes32=&gt;IexecLibCore_v5.DealBoost)</text>
-</g>
-<!-- 4&#45;&gt;63 -->
-<g id="edge4" class="edge">
-<title>4&#45;&gt;63</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1605.19,-724.71C1640.77,-762.35 1683.42,-805.76 1724.1,-842.8 1743.04,-860.05 1756.5,-856.5 1769.1,-878.8 1859.88,-1039.39 1720.31,-1137.7 1824.1,-1290.2 1879.59,-1371.73 1967.2,-1431.93 2053.68,-1475.09"/>
-<polygon fill="black" stroke="black" points="2052.34,-1478.33 2062.85,-1479.61 2055.43,-1472.05 2052.34,-1478.33"/>
+<!-- 27 -->
+<g id="node7" class="node">
+<title>27</title>
+<polygon fill="#f2f2f2" stroke="black" points="2222.19,-603.5 2222.19,-661.9 2471.03,-661.9 2471.03,-603.5 2222.19,-603.5"/>
+<text text-anchor="middle" x="2346.61" y="-645.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
+<text text-anchor="middle" x="2346.61" y="-628.5" font-family="Times,serif" font-size="14.00">IexecPoco1Errors</text>
+<text text-anchor="middle" x="2346.61" y="-611.7" font-family="Times,serif" font-size="14.00">contracts/interfaces/IexecPoco1Errors.sol</text>
 </g>
-<!-- 5 -->
-<g id="node3" class="node">
-<title>5</title>
-<polygon fill="#f2f2f2" stroke="black" points="2399.52,-582.7 2399.52,-682.7 4302.68,-682.7 4302.68,-582.7 2399.52,-582.7"/>
-<text text-anchor="middle" x="3351.1" y="-666.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Abstract&gt;&gt;</text>
-<text text-anchor="middle" x="3351.1" y="-649.3" font-family="Times,serif" font-size="14.00">IexecPocoCommon</text>
-<text text-anchor="middle" x="3351.1" y="-632.5" font-family="Times,serif" font-size="14.00">contracts/abstract/IexecPocoCommon.sol</text>
-<polyline fill="none" stroke="black" points="2399.52,-624.3 4302.68,-624.3 "/>
-<text text-anchor="start" x="2407.52" y="-607.7" font-family="Times,serif" font-size="14.00">Internal:</text>
-<text text-anchor="start" x="2407.52" y="-590.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_computeDealVolume(appOrderVolume: uint256, appOrderTypedDataHash: bytes32, hasDataset: bool, datasetOrderVolume: uint256, datasetOrderTypedDataHash: bytes32, workerpoolOrderVolume: uint256, workerpoolOrderTypedDataHash: bytes32, requestOrderVolume: uint256, requestOrderTypedDataHash: bytes32): uint256</text>
-</g>
-<!-- 5&#45;&gt;3 -->
-<g id="edge5" class="edge">
-<title>5&#45;&gt;3</title>
-<path fill="none" stroke="black" d="M3107.25,-682.74C2770.75,-750.7 2202.93,-866.61 2183.1,-878.8 2169.22,-887.33 2156.01,-897.48 2143.57,-908.62"/>
-<polygon fill="none" stroke="black" points="2136.17,-901.17 2122,-929.62 2150.82,-916.21 2136.17,-901.17"/>
+<!-- 11&#45;&gt;27 -->
+<g id="edge2" class="edge">
+<title>11&#45;&gt;27</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2346.61,-302.14C2346.61,-387.6 2346.61,-503.76 2346.61,-572.9"/>
+<polygon fill="none" stroke="black" points="2336.11,-573.14 2346.61,-603.14 2357.11,-573.14 2336.11,-573.14"/>
 </g>
-<!-- 51 -->
-<g id="node21" class="node">
-<title>51</title>
-<polygon fill="#f2f2f2" stroke="black" points="5007.33,-879.3 5007.33,-1289.7 5440.87,-1289.7 5440.87,-879.3 5007.33,-879.3"/>
-<text text-anchor="middle" x="5224.1" y="-1273.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
-<text text-anchor="middle" x="5224.1" y="-1256.3" font-family="Times,serif" font-size="14.00">IexecLibOrders_v5</text>
-<text text-anchor="middle" x="5224.1" y="-1239.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="5007.33,-1231.3 5440.87,-1231.3 "/>
-<text text-anchor="start" x="5015.33" y="-1214.7" font-family="Times,serif" font-size="14.00">Public:</text>
-<text text-anchor="start" x="5015.33" y="-1197.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;EIP712DOMAIN_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="5015.33" y="-1181.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;APPORDER_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="5015.33" y="-1164.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;DATASETORDER_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="5015.33" y="-1147.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;WORKERPOOLORDER_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="5015.33" y="-1130.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;REQUESTORDER_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="5015.33" y="-1113.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;APPORDEROPERATION_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="5015.33" y="-1097.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;DATASETORDEROPERATION_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="5015.33" y="-1080.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;WORKERPOOLORDEROPERATION_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="5015.33" y="-1063.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;REQUESTORDEROPERATION_TYPEHASH: bytes32</text>
-<polyline fill="none" stroke="black" points="5007.33,-1055.3 5440.87,-1055.3 "/>
-<text text-anchor="start" x="5015.33" y="-1038.7" font-family="Times,serif" font-size="14.00">Public:</text>
-<text text-anchor="start" x="5015.33" y="-1021.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_domain: EIP712Domain): (domainhash: bytes32)</text>
-<text text-anchor="start" x="5015.33" y="-1005.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_apporder: AppOrder): (apphash: bytes32)</text>
-<text text-anchor="start" x="5015.33" y="-988.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_datasetorder: DatasetOrder): (datasethash: bytes32)</text>
-<text text-anchor="start" x="5015.33" y="-971.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_workerpoolorder: WorkerpoolOrder): (workerpoolhash: bytes32)</text>
-<text text-anchor="start" x="5015.33" y="-954.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_requestorder: RequestOrder): (requesthash: bytes32)</text>
-<text text-anchor="start" x="5015.33" y="-937.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_apporderoperation: AppOrderOperation): bytes32</text>
-<text text-anchor="start" x="5015.33" y="-921.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_datasetorderoperation: DatasetOrderOperation): bytes32</text>
-<text text-anchor="start" x="5015.33" y="-904.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_workerpoolorderoperation: WorkerpoolOrderOperation): bytes32</text>
-<text text-anchor="start" x="5015.33" y="-887.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_requestorderoperation: RequestOrderOperation): bytes32</text>
-</g>
-<!-- 5&#45;&gt;51 -->
-<g id="edge6" class="edge">
-<title>5&#45;&gt;51</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3555.56,-682.8C3908.45,-767.55 4629.3,-940.66 4997.18,-1029"/>
-<polygon fill="black" stroke="black" points="4996.61,-1032.47 5007.15,-1031.4 4998.24,-1025.66 4996.61,-1032.47"/>
+<!-- 34 -->
+<g id="node9" class="node">
+<title>34</title>
+<polygon fill="#f2f2f2" stroke="black" points="2729.53,-511.5 2729.53,-753.9 4625.69,-753.9 4625.69,-511.5 2729.53,-511.5"/>
+<text text-anchor="middle" x="3677.61" y="-737.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
+<text text-anchor="middle" x="3677.61" y="-720.5" font-family="Times,serif" font-size="14.00">CommonLib</text>
+<text text-anchor="middle" x="3677.61" y="-703.7" font-family="Times,serif" font-size="14.00">contracts/libs/CommonLib.sol</text>
+<polyline fill="none" stroke="black" points="2729.53,-695.5 4625.69,-695.5 "/>
+<text text-anchor="start" x="2737.53" y="-678.9" font-family="Times,serif" font-size="14.00">Private:</text>
+<text text-anchor="start" x="2737.53" y="-662.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;GROUPMEMBER_PURPOSE: uint256</text>
+<polyline fill="none" stroke="black" points="2729.53,-653.9 4625.69,-653.9 "/>
+<text text-anchor="start" x="2737.53" y="-637.3" font-family="Times,serif" font-size="14.00">Internal:</text>
+<text text-anchor="start" x="2737.53" y="-620.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;toTypedDataHash(structHash: bytes32): bytes32</text>
+<text text-anchor="start" x="2737.53" y="-603.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;verifySignatureOfEthSignedMessage(account: address, message: bytes, signature: bytes): bool</text>
+<text text-anchor="start" x="2737.53" y="-586.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;verifySignature(account: address, messageHash: bytes32, signature: bytes): bool</text>
+<text text-anchor="start" x="2737.53" y="-570.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;verifyPresignature(account: address, messageHash: bytes32): bool</text>
+<text text-anchor="start" x="2737.53" y="-553.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;verifySignatureOrPresignature(account: address, messageHash: bytes32, signature: bytes): bool</text>
+<text text-anchor="start" x="2737.53" y="-536.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;isAccountAuthorizedByRestriction(restriction: address, account: address): bool</text>
+<text text-anchor="start" x="2737.53" y="-519.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;computeDealVolume(appOrderVolume: uint256, appOrderTypedDataHash: bytes32, hasDataset: bool, datasetOrderVolume: uint256, datasetOrderTypedDataHash: bytes32, workerpoolOrderVolume: uint256, workerpoolOrderTypedDataHash: bytes32, requestOrderVolume: uint256, requestOrderTypedDataHash: bytes32): uint256</text>
+</g>
+<!-- 11&#45;&gt;34 -->
+<g id="edge5" class="edge">
+<title>11&#45;&gt;34</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2674.77,-302.14C2864.77,-364.58 3104.65,-443.41 3302.16,-508.32"/>
+<polygon fill="black" stroke="black" points="3301.23,-511.7 3311.83,-511.49 3303.42,-505.05 3301.23,-511.7"/>
 </g>
-<!-- 5&#45;&gt;62 -->
-<g id="edge7" class="edge">
-<title>5&#45;&gt;62</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3238.75,-682.91C3050.63,-765.3 2672.29,-931 2466.05,-1021.33"/>
-<polygon fill="black" stroke="black" points="2464.42,-1018.22 2456.66,-1025.44 2467.23,-1024.63 2464.42,-1018.22"/>
+<!-- 35 -->
+<g id="node10" class="node">
+<title>35</title>
+<polygon fill="#f2f2f2" stroke="black" points="4681.98,-490.3 4681.98,-775.1 5087.24,-775.1 5087.24,-490.3 4681.98,-490.3"/>
+<text text-anchor="middle" x="4884.61" y="-758.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
+<text text-anchor="middle" x="4884.61" y="-741.7" font-family="Times,serif" font-size="14.00">EscrowLib</text>
+<text text-anchor="middle" x="4884.61" y="-724.9" font-family="Times,serif" font-size="14.00">contracts/libs/EscrowLib.sol</text>
+<polyline fill="none" stroke="black" points="4681.98,-716.7 5087.24,-716.7 "/>
+<text text-anchor="start" x="4689.98" y="-700.1" font-family="Times,serif" font-size="14.00">Internal:</text>
+<text text-anchor="start" x="4689.98" y="-683.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;lock(account: address, value: uint256)</text>
+<text text-anchor="start" x="4689.98" y="-666.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;unlock(account: address, value: uint256)</text>
+<text text-anchor="start" x="4689.98" y="-649.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;reward(account: address, value: uint256, ref: bytes32)</text>
+<text text-anchor="start" x="4689.98" y="-632.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;seize(account: address, value: uint256, ref: bytes32)</text>
+<text text-anchor="start" x="4689.98" y="-616.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;rewardAndLock(account: address, value: uint256, ref: bytes32)</text>
+<text text-anchor="start" x="4689.98" y="-599.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;transfer(from: address, to: address, value: uint256)</text>
+<text text-anchor="start" x="4689.98" y="-582.5" font-family="Times,serif" font-size="14.00">Public:</text>
+<text text-anchor="start" x="4689.98" y="-565.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Transfer(from: address, to: address, value: uint256)</text>
+<text text-anchor="start" x="4689.98" y="-548.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Reward(owner: address, amount: uint256, ref: bytes32)</text>
+<text text-anchor="start" x="4689.98" y="-532.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Seize(owner: address, amount: uint256, ref: bytes32)</text>
+<text text-anchor="start" x="4689.98" y="-515.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Lock(owner: address, amount: uint256)</text>
+<text text-anchor="start" x="4689.98" y="-498.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Unlock(owner: address, amount: uint256)</text>
+</g>
+<!-- 11&#45;&gt;35 -->
+<g id="edge16" class="edge">
+<title>11&#45;&gt;35</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3044.79,-212.81C3621.1,-237.24 4387.99,-293.53 4667.61,-422.6 4699.96,-437.53 4730.45,-459.31 4757.79,-483.25"/>
+<polygon fill="black" stroke="black" points="4755.62,-486.01 4765.41,-490.05 4760.28,-480.78 4755.62,-486.01"/>
 </g>
-<!-- 5&#45;&gt;63 -->
-<g id="edge8" class="edge">
-<title>5&#45;&gt;63</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3296.97,-682.99C3167.58,-800.82 2833.24,-1105.27 2592.63,-1324.37"/>
-<polygon fill="black" stroke="black" points="2590.22,-1321.84 2585.18,-1331.16 2594.93,-1327.01 2590.22,-1321.84"/>
+<!-- 36 -->
+<g id="node11" class="node">
+<title>36</title>
+<polygon fill="#f2f2f2" stroke="black" points="5449.44,-1988.5 5449.44,-2046.9 5661.78,-2046.9 5661.78,-1988.5 5449.44,-1988.5"/>
+<text text-anchor="middle" x="5555.61" y="-2030.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
+<text text-anchor="middle" x="5555.61" y="-2013.5" font-family="Times,serif" font-size="14.00">IexecLibCore_v5</text>
+<text text-anchor="middle" x="5555.61" y="-1996.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
 </g>
-<!-- 6 -->
-<g id="node4" class="node">
-<title>6</title>
-<polygon fill="#f2f2f2" stroke="black" points="1732.73,-540.7 1732.73,-724.7 2305.47,-724.7 2305.47,-540.7 1732.73,-540.7"/>
-<text text-anchor="middle" x="2019.1" y="-708.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Abstract&gt;&gt;</text>
-<text text-anchor="middle" x="2019.1" y="-691.3" font-family="Times,serif" font-size="14.00">SignatureVerifier</text>
-<text text-anchor="middle" x="2019.1" y="-674.5" font-family="Times,serif" font-size="14.00">contracts/abstract/SignatureVerifier.sol</text>
-<polyline fill="none" stroke="black" points="1732.73,-666.3 2305.47,-666.3 "/>
-<text text-anchor="start" x="1740.73" y="-649.7" font-family="Times,serif" font-size="14.00">Internal:</text>
-<text text-anchor="start" x="1740.73" y="-632.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_toTypedDataHash(structHash: bytes32): bytes32</text>
-<text text-anchor="start" x="1740.73" y="-616.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_verifySignatureOfEthSignedMessage(account: address, message: bytes, signature: bytes): bool</text>
-<text text-anchor="start" x="1740.73" y="-599.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_verifySignature(account: address, messageHash: bytes32, signature: bytes): bool</text>
-<text text-anchor="start" x="1740.73" y="-582.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_verifyPresignature(account: address, messageHash: bytes32): bool</text>
-<text text-anchor="start" x="1740.73" y="-565.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_verifySignatureOrPresignature(account: address, messageHash: bytes32, signature: bytes): bool</text>
-<text text-anchor="start" x="1740.73" y="-548.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_isAccountAuthorizedByRestriction(restriction: address, account: address): bool</text>
-</g>
-<!-- 6&#45;&gt;3 -->
+<!-- 11&#45;&gt;36 -->
 <g id="edge9" class="edge">
-<title>6&#45;&gt;3</title>
-<path fill="none" stroke="black" d="M2019.1,-724.72C2019.1,-774.9 2019.1,-839.06 2019.1,-899.21"/>
-<polygon fill="none" stroke="black" points="2008.6,-899.27 2019.1,-929.27 2029.6,-899.27 2008.6,-899.27"/>
+<title>11&#45;&gt;36</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3044.76,-204.76C3812.97,-223.59 4958.08,-276.16 5096.61,-422.6 5149.73,-478.76 5092.61,-1748.7 5134.61,-1813.6 5202.23,-1918.11 5339.97,-1970.29 5439.52,-1995.34"/>
+<polygon fill="black" stroke="black" points="5438.78,-1998.76 5449.33,-1997.75 5440.45,-1991.97 5438.78,-1998.76"/>
 </g>
-<!-- 6&#45;&gt;62 -->
+<!-- 43 -->
+<g id="node13" class="node">
+<title>43</title>
+<polygon fill="#f2f2f2" stroke="black" points="5258.44,-916.9 5258.44,-1252.1 5470.78,-1252.1 5470.78,-916.9 5258.44,-916.9"/>
+<text text-anchor="middle" x="5364.61" y="-1235.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="5364.61" y="-1218.7" font-family="Times,serif" font-size="14.00">Deal</text>
+<text text-anchor="middle" x="5364.61" y="-1201.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polyline fill="none" stroke="black" points="5258.44,-1193.7 5470.78,-1193.7 "/>
+<text text-anchor="start" x="5266.44" y="-1177.1" font-family="Times,serif" font-size="14.00">app: Resource</text>
+<text text-anchor="start" x="5266.44" y="-1160.3" font-family="Times,serif" font-size="14.00">dataset: Resource</text>
+<text text-anchor="start" x="5266.44" y="-1143.5" font-family="Times,serif" font-size="14.00">workerpool: Resource</text>
+<text text-anchor="start" x="5266.44" y="-1126.7" font-family="Times,serif" font-size="14.00">trust: uint256</text>
+<text text-anchor="start" x="5266.44" y="-1109.9" font-family="Times,serif" font-size="14.00">category: uint256</text>
+<text text-anchor="start" x="5266.44" y="-1093.1" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
+<text text-anchor="start" x="5266.44" y="-1076.3" font-family="Times,serif" font-size="14.00">requester: address</text>
+<text text-anchor="start" x="5266.44" y="-1059.5" font-family="Times,serif" font-size="14.00">beneficiary: address</text>
+<text text-anchor="start" x="5266.44" y="-1042.7" font-family="Times,serif" font-size="14.00">callback: address</text>
+<text text-anchor="start" x="5266.44" y="-1025.9" font-family="Times,serif" font-size="14.00">params: string</text>
+<text text-anchor="start" x="5266.44" y="-1009.1" font-family="Times,serif" font-size="14.00">startTime: uint256</text>
+<text text-anchor="start" x="5266.44" y="-992.3" font-family="Times,serif" font-size="14.00">botFirst: uint256</text>
+<text text-anchor="start" x="5266.44" y="-975.5" font-family="Times,serif" font-size="14.00">botSize: uint256</text>
+<text text-anchor="start" x="5266.44" y="-958.7" font-family="Times,serif" font-size="14.00">workerStake: uint256</text>
+<text text-anchor="start" x="5266.44" y="-941.9" font-family="Times,serif" font-size="14.00">schedulerRewardRatio: uint256</text>
+<text text-anchor="start" x="5266.44" y="-925.1" font-family="Times,serif" font-size="14.00">sponsor: address</text>
+</g>
+<!-- 11&#45;&gt;43 -->
 <g id="edge10" class="edge">
-<title>6&#45;&gt;62</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2080.82,-724.72C2136.66,-807.08 2218.04,-927.09 2271.03,-1005.23"/>
-<polygon fill="black" stroke="black" points="2268.19,-1007.29 2276.7,-1013.6 2273.99,-1003.36 2268.19,-1007.29"/>
+<title>11&#45;&gt;43</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3044.97,-229.44C3844.96,-272.97 5055.79,-350.25 5129.61,-422.6 5196.65,-488.3 5137.13,-755.9 5172.61,-842.8 5191.14,-888.19 5221.05,-931.96 5251.79,-969.44"/>
+<polygon fill="black" stroke="black" points="5249.27,-971.88 5258.36,-977.34 5254.66,-967.41 5249.27,-971.88"/>
 </g>
-<!-- 6&#45;&gt;63 -->
-<g id="edge11" class="edge">
-<title>6&#45;&gt;63</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1939.36,-724.73C1906.44,-768.24 1872.06,-822.95 1855.1,-878.8 1828.53,-966.28 1809.89,-1210.74 1855.1,-1290.2 1899.64,-1368.48 1975.79,-1427.05 2053.94,-1469.77"/>
-<polygon fill="black" stroke="black" points="2052.51,-1472.98 2062.98,-1474.63 2055.83,-1466.81 2052.51,-1472.98"/>
-</g>
-<!-- 13 -->
-<g id="node5" class="node">
-<title>13</title>
-<polygon fill="#f2f2f2" stroke="black" points="5481.89,-532.3 5481.89,-733.1 5704.31,-733.1 5704.31,-532.3 5481.89,-532.3"/>
-<text text-anchor="middle" x="5593.1" y="-716.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="5593.1" y="-699.7" font-family="Times,serif" font-size="14.00">Matching</text>
-<text text-anchor="middle" x="5593.1" y="-682.9" font-family="Times,serif" font-size="14.00">contracts/facets/IexecPoco1Facet.sol</text>
-<polyline fill="none" stroke="black" points="5481.89,-674.7 5704.31,-674.7 "/>
-<text text-anchor="start" x="5489.89" y="-658.1" font-family="Times,serif" font-size="14.00">apporderHash: bytes32</text>
-<text text-anchor="start" x="5489.89" y="-641.3" font-family="Times,serif" font-size="14.00">appOwner: address</text>
-<text text-anchor="start" x="5489.89" y="-624.5" font-family="Times,serif" font-size="14.00">datasetorderHash: bytes32</text>
-<text text-anchor="start" x="5489.89" y="-607.7" font-family="Times,serif" font-size="14.00">datasetOwner: address</text>
-<text text-anchor="start" x="5489.89" y="-590.9" font-family="Times,serif" font-size="14.00">workerpoolorderHash: bytes32</text>
-<text text-anchor="start" x="5489.89" y="-574.1" font-family="Times,serif" font-size="14.00">workerpoolOwner: address</text>
-<text text-anchor="start" x="5489.89" y="-557.3" font-family="Times,serif" font-size="14.00">requestorderHash: bytes32</text>
-<text text-anchor="start" x="5489.89" y="-540.5" font-family="Times,serif" font-size="14.00">hasDataset: bool</text>
-</g>
-<!-- 14 -->
-<g id="node6" class="node">
-<title>14</title>
-<polygon fill="#f2f2f2" stroke="black" points="3690.07,-84.5 3690.07,-302.1 5086.13,-302.1 5086.13,-84.5 3690.07,-84.5"/>
-<text text-anchor="middle" x="4388.1" y="-285.5" font-family="Times,serif" font-size="14.00">IexecPoco1Facet</text>
-<text text-anchor="middle" x="4388.1" y="-268.7" font-family="Times,serif" font-size="14.00">contracts/facets/IexecPoco1Facet.sol</text>
-<polyline fill="none" stroke="black" points="3690.07,-260.5 5086.13,-260.5 "/>
-<text text-anchor="start" x="3698.07" y="-243.9" font-family="Times,serif" font-size="14.00">Private:</text>
-<text text-anchor="start" x="3698.07" y="-227.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_matchOrders(_apporder: IexecLibOrders_v5.AppOrder, _datasetorder: IexecLibOrders_v5.DatasetOrder, _workerpoolorder: IexecLibOrders_v5.WorkerpoolOrder, _requestorder: IexecLibOrders_v5.RequestOrder, _sponsor: address): bytes32</text>
-<text text-anchor="start" x="3698.07" y="-210.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_ignoreTeeFramework(tag: bytes32): bytes32</text>
-<text text-anchor="start" x="3698.07" y="-193.5" font-family="Times,serif" font-size="14.00">External:</text>
-<text text-anchor="start" x="3698.07" y="-176.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;verifySignature(_identity: address, _hash: bytes32, _signature: bytes): bool</text>
-<text text-anchor="start" x="3698.07" y="-159.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;verifyPresignature(_identity: address, _hash: bytes32): bool</text>
-<text text-anchor="start" x="3698.07" y="-143.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;verifyPresignatureOrSignature(_identity: address, _hash: bytes32, _signature: bytes): bool</text>
-<text text-anchor="start" x="3698.07" y="-126.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;assertDatasetDealCompatibility(datasetOrder: IexecLibOrders_v5.DatasetOrder, dealId: bytes32)</text>
-<text text-anchor="start" x="3698.07" y="-109.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;matchOrders(_apporder: IexecLibOrders_v5.AppOrder, _datasetorder: IexecLibOrders_v5.DatasetOrder, _workerpoolorder: IexecLibOrders_v5.WorkerpoolOrder, _requestorder: IexecLibOrders_v5.RequestOrder): bytes32</text>
-<text text-anchor="start" x="3698.07" y="-92.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;sponsorMatchOrders(_apporder: IexecLibOrders_v5.AppOrder, _datasetorder: IexecLibOrders_v5.DatasetOrder, _workerpoolorder: IexecLibOrders_v5.WorkerpoolOrder, _requestorder: IexecLibOrders_v5.RequestOrder): bytes32</text>
-</g>
-<!-- 14&#45;&gt;4 -->
-<g id="edge14" class="edge">
-<title>14&#45;&gt;4</title>
-<path fill="none" stroke="black" d="M3689.81,-199.16C3019.22,-213.61 2059.96,-262.81 1724.1,-422.6 1678.54,-444.28 1637.76,-480.91 1604.97,-517.51"/>
-<polygon fill="none" stroke="black" points="1596.86,-510.84 1585.37,-540.47 1612.83,-524.48 1596.86,-510.84"/>
-</g>
-<!-- 14&#45;&gt;5 -->
-<g id="edge16" class="edge">
-<title>14&#45;&gt;5</title>
-<path fill="none" stroke="black" d="M4132.43,-302.14C3931.69,-386.81 3659.51,-501.62 3495.07,-570.97"/>
-<polygon fill="none" stroke="black" points="3490.96,-561.31 3467.4,-582.64 3499.12,-580.66 3490.96,-561.31"/>
+<!-- 50 -->
+<g id="node19" class="node">
+<title>50</title>
+<polygon fill="#f2f2f2" stroke="black" points="762.84,-879.3 762.84,-1289.7 1196.38,-1289.7 1196.38,-879.3 762.84,-879.3"/>
+<text text-anchor="middle" x="979.61" y="-1273.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
+<text text-anchor="middle" x="979.61" y="-1256.3" font-family="Times,serif" font-size="14.00">IexecLibOrders_v5</text>
+<text text-anchor="middle" x="979.61" y="-1239.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="762.84,-1231.3 1196.38,-1231.3 "/>
+<text text-anchor="start" x="770.84" y="-1214.7" font-family="Times,serif" font-size="14.00">Public:</text>
+<text text-anchor="start" x="770.84" y="-1197.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;EIP712DOMAIN_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="770.84" y="-1181.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;APPORDER_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="770.84" y="-1164.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;DATASETORDER_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="770.84" y="-1147.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;WORKERPOOLORDER_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="770.84" y="-1130.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;REQUESTORDER_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="770.84" y="-1113.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;APPORDEROPERATION_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="770.84" y="-1097.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;DATASETORDEROPERATION_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="770.84" y="-1080.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;WORKERPOOLORDEROPERATION_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="770.84" y="-1063.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;REQUESTORDEROPERATION_TYPEHASH: bytes32</text>
+<polyline fill="none" stroke="black" points="762.84,-1055.3 1196.38,-1055.3 "/>
+<text text-anchor="start" x="770.84" y="-1038.7" font-family="Times,serif" font-size="14.00">Public:</text>
+<text text-anchor="start" x="770.84" y="-1021.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_domain: EIP712Domain): (domainhash: bytes32)</text>
+<text text-anchor="start" x="770.84" y="-1005.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_apporder: AppOrder): (apphash: bytes32)</text>
+<text text-anchor="start" x="770.84" y="-988.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_datasetorder: DatasetOrder): (datasethash: bytes32)</text>
+<text text-anchor="start" x="770.84" y="-971.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_workerpoolorder: WorkerpoolOrder): (workerpoolhash: bytes32)</text>
+<text text-anchor="start" x="770.84" y="-954.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_requestorder: RequestOrder): (requesthash: bytes32)</text>
+<text text-anchor="start" x="770.84" y="-937.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_apporderoperation: AppOrderOperation): bytes32</text>
+<text text-anchor="start" x="770.84" y="-921.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_datasetorderoperation: DatasetOrderOperation): bytes32</text>
+<text text-anchor="start" x="770.84" y="-904.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_workerpoolorderoperation: WorkerpoolOrderOperation): bytes32</text>
+<text text-anchor="start" x="770.84" y="-887.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_requestorderoperation: RequestOrderOperation): bytes32</text>
+</g>
+<!-- 11&#45;&gt;50 -->
+<g id="edge4" class="edge">
+<title>11&#45;&gt;50</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1648.33,-252.92C1252.57,-293.42 824.31,-352.52 763.61,-422.6 641.34,-563.77 696.83,-668.39 763.61,-842.8 767.15,-852.04 771.22,-861.15 775.74,-870.1"/>
+<polygon fill="black" stroke="black" points="772.67,-871.77 780.41,-879 778.87,-868.52 772.67,-871.77"/>
 </g>
-<!-- 14&#45;&gt;6 -->
-<g id="edge15" class="edge">
-<title>14&#45;&gt;6</title>
-<path fill="none" stroke="black" d="M3689.8,-240.06C3201.97,-278.21 2596.76,-339.71 2357.1,-422.6 2288.94,-446.17 2220.1,-485.35 2162.5,-523.46"/>
-<polygon fill="none" stroke="black" points="2156.23,-515.02 2137.28,-540.54 2168.01,-532.41 2156.23,-515.02"/>
+<!-- 53 -->
+<g id="node22" class="node">
+<title>53</title>
+<polygon fill="#f2f2f2" stroke="black" points="1258,-1908.9 1258,-2126.5 1481.22,-2126.5 1481.22,-1908.9 1258,-1908.9"/>
+<text text-anchor="middle" x="1369.61" y="-2109.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="1369.61" y="-2093.1" font-family="Times,serif" font-size="14.00">AppOrder</text>
+<text text-anchor="middle" x="1369.61" y="-2076.3" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="1258,-2068.1 1481.22,-2068.1 "/>
+<text text-anchor="start" x="1266" y="-2051.5" font-family="Times,serif" font-size="14.00">app: address</text>
+<text text-anchor="start" x="1266" y="-2034.7" font-family="Times,serif" font-size="14.00">appprice: uint256</text>
+<text text-anchor="start" x="1266" y="-2017.9" font-family="Times,serif" font-size="14.00">volume: uint256</text>
+<text text-anchor="start" x="1266" y="-2001.1" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
+<text text-anchor="start" x="1266" y="-1984.3" font-family="Times,serif" font-size="14.00">datasetrestrict: address</text>
+<text text-anchor="start" x="1266" y="-1967.5" font-family="Times,serif" font-size="14.00">workerpoolrestrict: address</text>
+<text text-anchor="start" x="1266" y="-1950.7" font-family="Times,serif" font-size="14.00">requesterrestrict: address</text>
+<text text-anchor="start" x="1266" y="-1933.9" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
+<text text-anchor="start" x="1266" y="-1917.1" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+</g>
+<!-- 11&#45;&gt;53 -->
+<g id="edge11" class="edge">
+<title>11&#45;&gt;53</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1945.38,-302.18C1890.71,-332.86 1840.99,-372.2 1804.61,-422.6 1777.2,-460.57 1775.91,-796.17 1771.61,-842.8 1761.64,-950.81 1724.37,-1720.56 1668.61,-1813.6 1662.86,-1823.19 1570.8,-1885.08 1490.33,-1938.05"/>
+<polygon fill="black" stroke="black" points="1488.02,-1935.38 1481.59,-1943.8 1491.86,-1941.23 1488.02,-1935.38"/>
 </g>
-<!-- 14&#45;&gt;13 -->
-<g id="edge26" class="edge">
-<title>14&#45;&gt;13</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5086.28,-295.86C5253.43,-330.29 5403.42,-372.85 5472.1,-422.6 5506.7,-447.66 5532.92,-485.89 5551.96,-522.83"/>
-<polygon fill="black" stroke="black" points="5549.04,-524.82 5556.64,-532.19 5555.3,-521.68 5549.04,-524.82"/>
+<!-- 54 -->
+<g id="node23" class="node">
+<title>54</title>
+<polygon fill="#f2f2f2" stroke="black" points="1632,-1908.9 1632,-2126.5 1855.22,-2126.5 1855.22,-1908.9 1632,-1908.9"/>
+<text text-anchor="middle" x="1743.61" y="-2109.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="1743.61" y="-2093.1" font-family="Times,serif" font-size="14.00">DatasetOrder</text>
+<text text-anchor="middle" x="1743.61" y="-2076.3" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="1632,-2068.1 1855.22,-2068.1 "/>
+<text text-anchor="start" x="1640" y="-2051.5" font-family="Times,serif" font-size="14.00">dataset: address</text>
+<text text-anchor="start" x="1640" y="-2034.7" font-family="Times,serif" font-size="14.00">datasetprice: uint256</text>
+<text text-anchor="start" x="1640" y="-2017.9" font-family="Times,serif" font-size="14.00">volume: uint256</text>
+<text text-anchor="start" x="1640" y="-2001.1" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
+<text text-anchor="start" x="1640" y="-1984.3" font-family="Times,serif" font-size="14.00">apprestrict: address</text>
+<text text-anchor="start" x="1640" y="-1967.5" font-family="Times,serif" font-size="14.00">workerpoolrestrict: address</text>
+<text text-anchor="start" x="1640" y="-1950.7" font-family="Times,serif" font-size="14.00">requesterrestrict: address</text>
+<text text-anchor="start" x="1640" y="-1933.9" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
+<text text-anchor="start" x="1640" y="-1917.1" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+</g>
+<!-- 11&#45;&gt;54 -->
+<g id="edge6" class="edge">
+<title>11&#45;&gt;54</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1978.99,-302.24C1925.69,-333.03 1877.23,-372.38 1842.61,-422.6 1820.63,-454.47 1759.04,-1774.96 1756.61,-1813.6 1754.88,-1841.08 1753,-1870.65 1751.22,-1898.49"/>
+<polygon fill="black" stroke="black" points="1747.71,-1898.46 1750.57,-1908.66 1754.7,-1898.91 1747.71,-1898.46"/>
 </g>
-<!-- 29 -->
-<g id="node10" class="node">
-<title>29</title>
-<polygon fill="#f2f2f2" stroke="black" points="4472.61,-507.1 4472.61,-758.3 5463.59,-758.3 5463.59,-507.1 4472.61,-507.1"/>
-<text text-anchor="middle" x="4968.1" y="-741.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
-<text text-anchor="middle" x="4968.1" y="-724.9" font-family="Times,serif" font-size="14.00">IexecPoco1</text>
-<text text-anchor="middle" x="4968.1" y="-708.1" font-family="Times,serif" font-size="14.00">contracts/interfaces/IexecPoco1.sol</text>
-<polyline fill="none" stroke="black" points="4472.61,-699.9 5463.59,-699.9 "/>
-<text text-anchor="start" x="4480.61" y="-683.3" font-family="Times,serif" font-size="14.00">External:</text>
-<text text-anchor="start" x="4480.61" y="-666.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;verifySignature(address, bytes32, bytes): bool</text>
-<text text-anchor="start" x="4480.61" y="-649.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;verifyPresignature(address, bytes32): bool</text>
-<text text-anchor="start" x="4480.61" y="-632.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;verifyPresignatureOrSignature(address, bytes32, bytes): bool</text>
-<text text-anchor="start" x="4480.61" y="-616.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;assertDatasetDealCompatibility(datasetOrder: IexecLibOrders_v5.DatasetOrder, dealId: bytes32)</text>
-<text text-anchor="start" x="4480.61" y="-599.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;matchOrders(IexecLibOrders_v5.AppOrder, IexecLibOrders_v5.DatasetOrder, IexecLibOrders_v5.WorkerpoolOrder, IexecLibOrders_v5.RequestOrder): bytes32</text>
-<text text-anchor="start" x="4480.61" y="-582.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;sponsorMatchOrders(IexecLibOrders_v5.AppOrder, IexecLibOrders_v5.DatasetOrder, IexecLibOrders_v5.WorkerpoolOrder, IexecLibOrders_v5.RequestOrder): bytes32</text>
-<text text-anchor="start" x="4480.61" y="-565.7" font-family="Times,serif" font-size="14.00">Public:</text>
-<text text-anchor="start" x="4480.61" y="-548.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; SchedulerNotice(workerpool: address, dealid: bytes32)</text>
-<text text-anchor="start" x="4480.61" y="-532.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; OrdersMatched(dealid: bytes32, appHash: bytes32, datasetHash: bytes32, workerpoolHash: bytes32, requestHash: bytes32, volume: uint256)</text>
-<text text-anchor="start" x="4480.61" y="-515.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; DealSponsored(dealId: bytes32, sponsor: address)</text>
-</g>
-<!-- 14&#45;&gt;29 -->
+<!-- 55 -->
+<g id="node24" class="node">
+<title>55</title>
+<polygon fill="#f2f2f2" stroke="black" points="0,-1892.1 0,-2143.3 223.22,-2143.3 223.22,-1892.1 0,-1892.1"/>
+<text text-anchor="middle" x="111.61" y="-2126.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="111.61" y="-2109.9" font-family="Times,serif" font-size="14.00">WorkerpoolOrder</text>
+<text text-anchor="middle" x="111.61" y="-2093.1" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="0,-2084.9 223.22,-2084.9 "/>
+<text text-anchor="start" x="8" y="-2068.3" font-family="Times,serif" font-size="14.00">workerpool: address</text>
+<text text-anchor="start" x="8" y="-2051.5" font-family="Times,serif" font-size="14.00">workerpoolprice: uint256</text>
+<text text-anchor="start" x="8" y="-2034.7" font-family="Times,serif" font-size="14.00">volume: uint256</text>
+<text text-anchor="start" x="8" y="-2017.9" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
+<text text-anchor="start" x="8" y="-2001.1" font-family="Times,serif" font-size="14.00">category: uint256</text>
+<text text-anchor="start" x="8" y="-1984.3" font-family="Times,serif" font-size="14.00">trust: uint256</text>
+<text text-anchor="start" x="8" y="-1967.5" font-family="Times,serif" font-size="14.00">apprestrict: address</text>
+<text text-anchor="start" x="8" y="-1950.7" font-family="Times,serif" font-size="14.00">datasetrestrict: address</text>
+<text text-anchor="start" x="8" y="-1933.9" font-family="Times,serif" font-size="14.00">requesterrestrict: address</text>
+<text text-anchor="start" x="8" y="-1917.1" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
+<text text-anchor="start" x="8" y="-1900.3" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+</g>
+<!-- 11&#45;&gt;55 -->
 <g id="edge12" class="edge">
-<title>14&#45;&gt;29</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4531.1,-302.14C4605.81,-358.49 4698.23,-428.18 4778.8,-488.94"/>
-<polygon fill="none" stroke="black" points="4772.56,-497.39 4802.83,-507.07 4785.2,-480.62 4772.56,-497.39"/>
-</g>
-<!-- 30 -->
-<g id="node11" class="node">
-<title>30</title>
-<polygon fill="#f2f2f2" stroke="black" points="5722.68,-603.5 5722.68,-661.9 5971.52,-661.9 5971.52,-603.5 5722.68,-603.5"/>
-<text text-anchor="middle" x="5847.1" y="-645.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
-<text text-anchor="middle" x="5847.1" y="-628.5" font-family="Times,serif" font-size="14.00">IexecPoco1Errors</text>
-<text text-anchor="middle" x="5847.1" y="-611.7" font-family="Times,serif" font-size="14.00">contracts/interfaces/IexecPoco1Errors.sol</text>
+<title>11&#45;&gt;55</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1648.51,-233.2C1100.98,-270.2 415.21,-333.5 315.61,-422.6 -103.53,-797.56 10.89,-1570.28 78.5,-1881.97"/>
+<polygon fill="black" stroke="black" points="75.13,-1882.94 80.69,-1891.96 81.97,-1881.44 75.13,-1882.94"/>
 </g>
-<!-- 14&#45;&gt;30 -->
+<!-- 56 -->
+<g id="node25" class="node">
+<title>56</title>
+<polygon fill="#f2f2f2" stroke="black" points="241,-1850.1 241,-2185.3 464.22,-2185.3 464.22,-1850.1 241,-1850.1"/>
+<text text-anchor="middle" x="352.61" y="-2168.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="352.61" y="-2151.9" font-family="Times,serif" font-size="14.00">RequestOrder</text>
+<text text-anchor="middle" x="352.61" y="-2135.1" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="241,-2126.9 464.22,-2126.9 "/>
+<text text-anchor="start" x="249" y="-2110.3" font-family="Times,serif" font-size="14.00">app: address</text>
+<text text-anchor="start" x="249" y="-2093.5" font-family="Times,serif" font-size="14.00">appmaxprice: uint256</text>
+<text text-anchor="start" x="249" y="-2076.7" font-family="Times,serif" font-size="14.00">dataset: address</text>
+<text text-anchor="start" x="249" y="-2059.9" font-family="Times,serif" font-size="14.00">datasetmaxprice: uint256</text>
+<text text-anchor="start" x="249" y="-2043.1" font-family="Times,serif" font-size="14.00">workerpool: address</text>
+<text text-anchor="start" x="249" y="-2026.3" font-family="Times,serif" font-size="14.00">workerpoolmaxprice: uint256</text>
+<text text-anchor="start" x="249" y="-2009.5" font-family="Times,serif" font-size="14.00">requester: address</text>
+<text text-anchor="start" x="249" y="-1992.7" font-family="Times,serif" font-size="14.00">volume: uint256</text>
+<text text-anchor="start" x="249" y="-1975.9" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
+<text text-anchor="start" x="249" y="-1959.1" font-family="Times,serif" font-size="14.00">category: uint256</text>
+<text text-anchor="start" x="249" y="-1942.3" font-family="Times,serif" font-size="14.00">trust: uint256</text>
+<text text-anchor="start" x="249" y="-1925.5" font-family="Times,serif" font-size="14.00">beneficiary: address</text>
+<text text-anchor="start" x="249" y="-1908.7" font-family="Times,serif" font-size="14.00">callback: address</text>
+<text text-anchor="start" x="249" y="-1891.9" font-family="Times,serif" font-size="14.00">params: string</text>
+<text text-anchor="start" x="249" y="-1875.1" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
+<text text-anchor="start" x="249" y="-1858.3" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+</g>
+<!-- 11&#45;&gt;56 -->
 <g id="edge13" class="edge">
-<title>14&#45;&gt;30</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5086.37,-263.3C5347.32,-299.67 5606.3,-351.75 5713.1,-422.6 5768.18,-459.14 5805.35,-526.9 5826.3,-575.39"/>
-<polygon fill="none" stroke="black" points="5816.58,-579.37 5837.51,-603.29 5836.07,-571.54 5816.58,-579.37"/>
+<title>11&#45;&gt;56</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1648.46,-239.4C1271.82,-273.65 851.35,-330.92 687.61,-422.6 298.87,-640.26 283.28,-881.67 253.61,-1326.2 239.18,-1542.34 204.9,-1602.52 253.61,-1813.6 255.65,-1822.44 258.13,-1831.34 260.95,-1840.22"/>
+<polygon fill="black" stroke="black" points="257.67,-1841.46 264.15,-1849.85 264.32,-1839.25 257.67,-1841.46"/>
 </g>
-<!-- 37 -->
-<g id="node13" class="node">
-<title>37</title>
-<polygon fill="#f2f2f2" stroke="black" points="793.93,-1988.5 793.93,-2046.9 1006.27,-2046.9 1006.27,-1988.5 793.93,-1988.5"/>
-<text text-anchor="middle" x="900.1" y="-2030.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
-<text text-anchor="middle" x="900.1" y="-2013.5" font-family="Times,serif" font-size="14.00">IexecLibCore_v5</text>
-<text text-anchor="middle" x="900.1" y="-1996.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<!-- 61 -->
+<g id="node30" class="node">
+<title>61</title>
+<polygon fill="#f2f2f2" stroke="black" points="4592.16,-1013.7 4592.16,-1155.3 4857.05,-1155.3 4857.05,-1013.7 4592.16,-1013.7"/>
+<text text-anchor="middle" x="4724.61" y="-1138.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
+<text text-anchor="middle" x="4724.61" y="-1121.9" font-family="Times,serif" font-size="14.00">PocoStorageLib</text>
+<text text-anchor="middle" x="4724.61" y="-1105.1" font-family="Times,serif" font-size="14.00">contracts/libs/PocoStorageLib.sol</text>
+<polyline fill="none" stroke="black" points="4592.16,-1096.9 4857.05,-1096.9 "/>
+<text text-anchor="start" x="4600.16" y="-1080.3" font-family="Times,serif" font-size="14.00">Private:</text>
+<text text-anchor="start" x="4600.16" y="-1063.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;POCO_STORAGE_LOCATION: bytes32</text>
+<polyline fill="none" stroke="black" points="4592.16,-1055.3 4857.05,-1055.3 "/>
+<text text-anchor="start" x="4600.16" y="-1038.7" font-family="Times,serif" font-size="14.00">Internal:</text>
+<text text-anchor="start" x="4600.16" y="-1021.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;getPocoStorage(): ($: PocoStorage)</text>
+</g>
+<!-- 11&#45;&gt;61 -->
+<g id="edge7" class="edge">
+<title>11&#45;&gt;61</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3044.75,-219.7C3676.09,-249.73 4523.5,-310.45 4634.61,-422.6 4667.6,-455.9 4665.53,-796.46 4672.61,-842.8 4680.88,-896.95 4693.89,-957.2 4704.84,-1003.87"/>
+<polygon fill="black" stroke="black" points="4701.43,-1004.69 4707.14,-1013.62 4708.25,-1003.08 4701.43,-1004.69"/>
 </g>
-<!-- 14&#45;&gt;37 -->
-<g id="edge21" class="edge">
-<title>14&#45;&gt;37</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4384.64,-302.2C4378.64,-473.53 4365.2,-793.56 4347.1,-842.8 4261.5,-1075.71 4211.92,-1141.72 4013.1,-1290.2 3474.51,-1692.41 3251.61,-1673.81 2594.1,-1813.6 2355.36,-1864.36 2288.83,-1823.97 2046.1,-1849.6 1667.89,-1889.53 1222.94,-1961.68 1016.35,-1996.64"/>
-<polygon fill="black" stroke="black" points="1015.67,-1993.2 1006.39,-1998.32 1016.84,-2000.1 1015.67,-1993.2"/>
+<!-- 62 -->
+<g id="node31" class="node">
+<title>62</title>
+<polygon fill="#f2f2f2" stroke="black" points="4463.64,-1326.7 4463.64,-1813.1 4985.58,-1813.1 4985.58,-1326.7 4463.64,-1326.7"/>
+<text text-anchor="middle" x="4724.61" y="-1796.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="4724.61" y="-1779.7" font-family="Times,serif" font-size="14.00">PocoStorage</text>
+<text text-anchor="middle" x="4724.61" y="-1762.9" font-family="Times,serif" font-size="14.00">contracts/libs/PocoStorageLib.sol</text>
+<polyline fill="none" stroke="black" points="4463.64,-1754.7 4985.58,-1754.7 "/>
+<text text-anchor="start" x="4471.64" y="-1738.1" font-family="Times,serif" font-size="14.00">m_appregistry: IRegistry</text>
+<text text-anchor="start" x="4471.64" y="-1721.3" font-family="Times,serif" font-size="14.00">m_datasetregistry: IRegistry</text>
+<text text-anchor="start" x="4471.64" y="-1704.5" font-family="Times,serif" font-size="14.00">m_workerpoolregistry: IRegistry</text>
+<text text-anchor="start" x="4471.64" y="-1687.7" font-family="Times,serif" font-size="14.00">m_baseToken: IERC20</text>
+<text text-anchor="start" x="4471.64" y="-1670.9" font-family="Times,serif" font-size="14.00">m_name: string</text>
+<text text-anchor="start" x="4471.64" y="-1654.1" font-family="Times,serif" font-size="14.00">m_symbol: string</text>
+<text text-anchor="start" x="4471.64" y="-1637.3" font-family="Times,serif" font-size="14.00">m_decimals: uint8</text>
+<text text-anchor="start" x="4471.64" y="-1620.5" font-family="Times,serif" font-size="14.00">m_totalSupply: uint256</text>
+<text text-anchor="start" x="4471.64" y="-1603.7" font-family="Times,serif" font-size="14.00">m_balances: mapping(address=&gt;uint256)</text>
+<text text-anchor="start" x="4471.64" y="-1586.9" font-family="Times,serif" font-size="14.00">m_frozens: mapping(address=&gt;uint256)</text>
+<text text-anchor="start" x="4471.64" y="-1570.1" font-family="Times,serif" font-size="14.00">m_allowances: mapping(address=&gt;mapping(address=&gt;uint256))</text>
+<text text-anchor="start" x="4471.64" y="-1553.3" font-family="Times,serif" font-size="14.00">m_eip712DomainSeparator: bytes32</text>
+<text text-anchor="start" x="4471.64" y="-1536.5" font-family="Times,serif" font-size="14.00">m_presigned: mapping(bytes32=&gt;address)</text>
+<text text-anchor="start" x="4471.64" y="-1519.7" font-family="Times,serif" font-size="14.00">m_consumed: mapping(bytes32=&gt;uint256)</text>
+<text text-anchor="start" x="4471.64" y="-1502.9" font-family="Times,serif" font-size="14.00">m_deals: mapping(bytes32=&gt;IexecLibCore_v5.Deal)</text>
+<text text-anchor="start" x="4471.64" y="-1486.1" font-family="Times,serif" font-size="14.00">m_tasks: mapping(bytes32=&gt;IexecLibCore_v5.Task)</text>
+<text text-anchor="start" x="4471.64" y="-1469.3" font-family="Times,serif" font-size="14.00">m_consensus: mapping(bytes32=&gt;IexecLibCore_v5.Consensus)</text>
+<text text-anchor="start" x="4471.64" y="-1452.5" font-family="Times,serif" font-size="14.00">m_contributions: mapping(bytes32=&gt;mapping(address=&gt;IexecLibCore_v5.Contribution))</text>
+<text text-anchor="start" x="4471.64" y="-1435.7" font-family="Times,serif" font-size="14.00">m_workerScores: mapping(address=&gt;uint256)</text>
+<text text-anchor="start" x="4471.64" y="-1418.9" font-family="Times,serif" font-size="14.00">m_teebroker: address</text>
+<text text-anchor="start" x="4471.64" y="-1402.1" font-family="Times,serif" font-size="14.00">m_callbackgas: uint256</text>
+<text text-anchor="start" x="4471.64" y="-1385.3" font-family="Times,serif" font-size="14.00">m_categories: IexecLibCore_v5.Category[]</text>
+<text text-anchor="start" x="4471.64" y="-1368.5" font-family="Times,serif" font-size="14.00">m_v3_iexecHub: IexecHubV3Interface</text>
+<text text-anchor="start" x="4471.64" y="-1351.7" font-family="Times,serif" font-size="14.00">m_v3_scoreImported: mapping(address=&gt;bool)</text>
+<text text-anchor="start" x="4471.64" y="-1334.9" font-family="Times,serif" font-size="14.00">m_dealsBoost: mapping(bytes32=&gt;IexecLibCore_v5.DealBoost)</text>
+</g>
+<!-- 11&#45;&gt;62 -->
+<g id="edge8" class="edge">
+<title>11&#45;&gt;62</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2013.1,-302.14C1962.39,-333.08 1916.69,-372.52 1885.61,-422.6 1836.37,-501.94 1828.34,-769.04 1885.61,-842.8 2202.68,-1251.17 3805.78,-1468.78 4453.02,-1541.13"/>
+<polygon fill="black" stroke="black" points="4453.09,-1544.66 4463.42,-1542.29 4453.87,-1537.7 4453.09,-1544.66"/>
 </g>
-<!-- 44 -->
-<g id="node15" class="node">
-<title>44</title>
-<polygon fill="#f2f2f2" stroke="black" points="1061.93,-916.9 1061.93,-1252.1 1274.27,-1252.1 1274.27,-916.9 1061.93,-916.9"/>
-<text text-anchor="middle" x="1168.1" y="-1235.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="1168.1" y="-1218.7" font-family="Times,serif" font-size="14.00">Deal</text>
-<text text-anchor="middle" x="1168.1" y="-1201.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
-<polyline fill="none" stroke="black" points="1061.93,-1193.7 1274.27,-1193.7 "/>
-<text text-anchor="start" x="1069.93" y="-1177.1" font-family="Times,serif" font-size="14.00">app: Resource</text>
-<text text-anchor="start" x="1069.93" y="-1160.3" font-family="Times,serif" font-size="14.00">dataset: Resource</text>
-<text text-anchor="start" x="1069.93" y="-1143.5" font-family="Times,serif" font-size="14.00">workerpool: Resource</text>
-<text text-anchor="start" x="1069.93" y="-1126.7" font-family="Times,serif" font-size="14.00">trust: uint256</text>
-<text text-anchor="start" x="1069.93" y="-1109.9" font-family="Times,serif" font-size="14.00">category: uint256</text>
-<text text-anchor="start" x="1069.93" y="-1093.1" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
-<text text-anchor="start" x="1069.93" y="-1076.3" font-family="Times,serif" font-size="14.00">requester: address</text>
-<text text-anchor="start" x="1069.93" y="-1059.5" font-family="Times,serif" font-size="14.00">beneficiary: address</text>
-<text text-anchor="start" x="1069.93" y="-1042.7" font-family="Times,serif" font-size="14.00">callback: address</text>
-<text text-anchor="start" x="1069.93" y="-1025.9" font-family="Times,serif" font-size="14.00">params: string</text>
-<text text-anchor="start" x="1069.93" y="-1009.1" font-family="Times,serif" font-size="14.00">startTime: uint256</text>
-<text text-anchor="start" x="1069.93" y="-992.3" font-family="Times,serif" font-size="14.00">botFirst: uint256</text>
-<text text-anchor="start" x="1069.93" y="-975.5" font-family="Times,serif" font-size="14.00">botSize: uint256</text>
-<text text-anchor="start" x="1069.93" y="-958.7" font-family="Times,serif" font-size="14.00">workerStake: uint256</text>
-<text text-anchor="start" x="1069.93" y="-941.9" font-family="Times,serif" font-size="14.00">schedulerRewardRatio: uint256</text>
-<text text-anchor="start" x="1069.93" y="-925.1" font-family="Times,serif" font-size="14.00">sponsor: address</text>
-</g>
-<!-- 14&#45;&gt;44 -->
-<g id="edge22" class="edge">
-<title>14&#45;&gt;44</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3689.75,-246.28C2784.67,-313.66 1321.1,-422.6 1321.1,-422.6 1178.62,-548.84 1283.17,-657.85 1238.1,-842.8 1233.03,-863.61 1227.32,-885.31 1221.41,-906.8"/>
-<polygon fill="black" stroke="black" points="1217.98,-906.08 1218.68,-916.65 1224.72,-907.95 1217.98,-906.08"/>
+<!-- 78 -->
+<g id="node33" class="node">
+<title>78</title>
+<polygon fill="#f2f2f2" stroke="black" points="1895.04,-557.5 1895.04,-707.9 2204.18,-707.9 2204.18,-557.5 1895.04,-557.5"/>
+<text text-anchor="middle" x="2049.61" y="-691.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
+<text text-anchor="middle" x="2049.61" y="-674.5" font-family="Times,serif" font-size="14.00">IWorkerpool</text>
+<text text-anchor="middle" x="2049.61" y="-657.7" font-family="Times,serif" font-size="14.00">contracts/registries/workerpools/IWorkerpool.v8.sol</text>
+<polyline fill="none" stroke="black" points="1895.04,-649.5 2204.18,-649.5 "/>
+<text text-anchor="start" x="1903.04" y="-632.9" font-family="Times,serif" font-size="14.00">External:</text>
+<text text-anchor="start" x="1903.04" y="-616.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;owner(): address</text>
+<text text-anchor="start" x="1903.04" y="-599.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;m_workerpoolDescription(): string</text>
+<text text-anchor="start" x="1903.04" y="-582.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;m_schedulerRewardRatioPolicy(): uint256</text>
+<text text-anchor="start" x="1903.04" y="-565.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;m_workerStakeRatioPolicy(): uint256</text>
+</g>
+<!-- 11&#45;&gt;78 -->
+<g id="edge15" class="edge">
+<title>11&#45;&gt;78</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2273.38,-302.14C2221.64,-378.35 2153.31,-478.97 2105.84,-548.89"/>
+<polygon fill="black" stroke="black" points="2102.87,-547.02 2100.15,-557.26 2108.67,-550.96 2102.87,-547.02"/>
 </g>
-<!-- 14&#45;&gt;51 -->
+<!-- 12 -->
+<g id="node4" class="node">
+<title>12</title>
+<polygon fill="#f2f2f2" stroke="black" points="5072.24,-0.5 5072.24,-386.1 6118.98,-386.1 6118.98,-0.5 5072.24,-0.5"/>
+<text text-anchor="middle" x="5595.61" y="-369.5" font-family="Times,serif" font-size="14.00">IexecPoco2Facet</text>
+<text text-anchor="middle" x="5595.61" y="-352.7" font-family="Times,serif" font-size="14.00">contracts/facets/IexecPoco2Facet.sol</text>
+<polyline fill="none" stroke="black" points="5072.24,-344.5 6118.98,-344.5 "/>
+<text text-anchor="start" x="5080.24" y="-327.9" font-family="Times,serif" font-size="14.00">Internal:</text>
+<text text-anchor="start" x="5080.24" y="-311.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;successWork(_dealid: bytes32, _taskid: bytes32)</text>
+<text text-anchor="start" x="5080.24" y="-294.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;failedWork(_dealid: bytes32, _taskid: bytes32)</text>
+<text text-anchor="start" x="5080.24" y="-277.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;checkConsensus(_taskid: bytes32, _consensus: bytes32)</text>
+<text text-anchor="start" x="5080.24" y="-260.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;distributeRewards(_taskid: bytes32)</text>
+<text text-anchor="start" x="5080.24" y="-243.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;distributeRewardsFast(_taskid: bytes32)</text>
+<text text-anchor="start" x="5080.24" y="-227.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;executeCallback(_taskid: bytes32, _resultsCallback: bytes)</text>
+<text text-anchor="start" x="5080.24" y="-210.3" font-family="Times,serif" font-size="14.00">External:</text>
+<text text-anchor="start" x="5080.24" y="-193.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;contribute(_taskid: bytes32, _resultHash: bytes32, _resultSeal: bytes32, _enclaveChallenge: address, _enclaveSign: bytes, _authorizationSign: bytes)</text>
+<text text-anchor="start" x="5080.24" y="-176.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;contributeAndFinalize(_taskid: bytes32, _resultDigest: bytes32, _results: bytes, _resultsCallback: bytes, _enclaveChallenge: address, _enclaveSign: bytes, _authorizationSign: bytes)</text>
+<text text-anchor="start" x="5080.24" y="-159.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;reveal(_taskid: bytes32, _resultDigest: bytes32)</text>
+<text text-anchor="start" x="5080.24" y="-143.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;reopen(_taskid: bytes32) &lt;&lt;onlyScheduler&gt;&gt;</text>
+<text text-anchor="start" x="5080.24" y="-126.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;finalize(_taskid: bytes32, _results: bytes, _resultsCallback: bytes) &lt;&lt;onlyScheduler&gt;&gt;</text>
+<text text-anchor="start" x="5080.24" y="-109.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;initializeArray(_dealid: bytes32[], _idx: uint256[]): bool</text>
+<text text-anchor="start" x="5080.24" y="-92.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;claimArray(_taskid: bytes32[]): bool</text>
+<text text-anchor="start" x="5080.24" y="-75.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;initializeAndClaimArray(_dealid: bytes32[], _idx: uint256[]): bool</text>
+<text text-anchor="start" x="5080.24" y="-59.1" font-family="Times,serif" font-size="14.00">Public:</text>
+<text text-anchor="start" x="5080.24" y="-42.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;modifier&gt;&gt; onlyScheduler(_taskId: bytes32)</text>
+<text text-anchor="start" x="5080.24" y="-25.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;initialize(_dealid: bytes32, idx: uint256): bytes32</text>
+<text text-anchor="start" x="5080.24" y="-8.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;claim(_taskid: bytes32)</text>
+</g>
+<!-- 12&#45;&gt;3 -->
+<g id="edge18" class="edge">
+<title>12&#45;&gt;3</title>
+<path fill="none" stroke="black" d="M5482.01,-386.15C5469.11,-407.94 5455.99,-430.08 5443.19,-451.71"/>
+<polygon fill="none" stroke="black" points="5434.01,-446.6 5427.76,-477.77 5452.08,-457.3 5434.01,-446.6"/>
+</g>
+<!-- 28 -->
+<g id="node8" class="node">
+<title>28</title>
+<polygon fill="#f2f2f2" stroke="black" points="5813.6,-423.1 5813.6,-842.3 6815.61,-842.3 6815.61,-423.1 5813.6,-423.1"/>
+<text text-anchor="middle" x="6314.61" y="-825.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
+<text text-anchor="middle" x="6314.61" y="-808.9" font-family="Times,serif" font-size="14.00">IexecPoco2</text>
+<text text-anchor="middle" x="6314.61" y="-792.1" font-family="Times,serif" font-size="14.00">contracts/interfaces/IexecPoco2.sol</text>
+<polyline fill="none" stroke="black" points="5813.6,-783.9 6815.61,-783.9 "/>
+<text text-anchor="start" x="5821.6" y="-767.3" font-family="Times,serif" font-size="14.00">External:</text>
+<text text-anchor="start" x="5821.6" y="-750.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;initialize(dealId: bytes32, index: uint256): bytes32</text>
+<text text-anchor="start" x="5821.6" y="-733.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;claim(taskId: bytes32)</text>
+<text text-anchor="start" x="5821.6" y="-716.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;contribute(taskId: bytes32, resultHash: bytes32, resultSeal: bytes32, enclaveChallenge: address, enclaveSign: bytes, authorizationSign: bytes)</text>
+<text text-anchor="start" x="5821.6" y="-700.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;contributeAndFinalize(taskId: bytes32, resultDigest: bytes32, results: bytes, resultsCallback: bytes, enclaveChallenge: address, enclaveSign: bytes, authorizationSign: bytes)</text>
+<text text-anchor="start" x="5821.6" y="-683.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;reveal(taskId: bytes32, resultDigest: bytes32)</text>
+<text text-anchor="start" x="5821.6" y="-666.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;reopen(taskId: bytes32)</text>
+<text text-anchor="start" x="5821.6" y="-649.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;finalize(taskId: bytes32, results: bytes, resultsCallback: bytes)</text>
+<text text-anchor="start" x="5821.6" y="-632.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;initializeArray(dealIds: bytes32[], indexes: uint256[]): bool</text>
+<text text-anchor="start" x="5821.6" y="-616.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;claimArray(taskIds: bytes32[]): bool</text>
+<text text-anchor="start" x="5821.6" y="-599.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;initializeAndClaimArray(dealIds: bytes32[], indexes: uint256[]): bool</text>
+<text text-anchor="start" x="5821.6" y="-582.5" font-family="Times,serif" font-size="14.00">Public:</text>
+<text text-anchor="start" x="5821.6" y="-565.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; AccurateContribution(worker: address, taskid: bytes32)</text>
+<text text-anchor="start" x="5821.6" y="-548.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; FaultyContribution(worker: address, taskid: bytes32)</text>
+<text text-anchor="start" x="5821.6" y="-532.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; TaskInitialize(taskid: bytes32, workerpool: address)</text>
+<text text-anchor="start" x="5821.6" y="-515.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; TaskContribute(taskid: bytes32, worker: address, hash: bytes32)</text>
+<text text-anchor="start" x="5821.6" y="-498.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; TaskConsensus(taskid: bytes32, consensus: bytes32)</text>
+<text text-anchor="start" x="5821.6" y="-481.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; TaskReveal(taskid: bytes32, worker: address, digest: bytes32)</text>
+<text text-anchor="start" x="5821.6" y="-464.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; TaskReopen(taskid: bytes32)</text>
+<text text-anchor="start" x="5821.6" y="-448.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; TaskFinalize(taskid: bytes32, results: bytes)</text>
+<text text-anchor="start" x="5821.6" y="-431.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; TaskClaimed(taskid: bytes32)</text>
+</g>
+<!-- 12&#45;&gt;28 -->
 <g id="edge17" class="edge">
-<title>14&#45;&gt;51</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5086.45,-232.71C5601.3,-268.39 6225.92,-330.07 6308.1,-422.6 6339.1,-457.51 6337.32,-806.38 6308.1,-842.8 6202.77,-974.08 5736.79,-1038.26 5451.17,-1065.79"/>
-<polygon fill="black" stroke="black" points="5450.7,-1062.32 5441.08,-1066.76 5451.37,-1069.29 5450.7,-1062.32"/>
+<title>12&#45;&gt;28</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5910.97,-386.15C5922.43,-393.12 5933.95,-400.13 5945.48,-407.14"/>
+<polygon fill="none" stroke="black" points="5940.47,-416.38 5971.55,-423 5951.38,-398.44 5940.47,-416.38"/>
 </g>
-<!-- 54 -->
-<g id="node24" class="node">
-<title>54</title>
-<polygon fill="#f2f2f2" stroke="black" points="6029.49,-1908.9 6029.49,-2126.5 6252.71,-2126.5 6252.71,-1908.9 6029.49,-1908.9"/>
-<text text-anchor="middle" x="6141.1" y="-2109.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="6141.1" y="-2093.1" font-family="Times,serif" font-size="14.00">AppOrder</text>
-<text text-anchor="middle" x="6141.1" y="-2076.3" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="6029.49,-2068.1 6252.71,-2068.1 "/>
-<text text-anchor="start" x="6037.49" y="-2051.5" font-family="Times,serif" font-size="14.00">app: address</text>
-<text text-anchor="start" x="6037.49" y="-2034.7" font-family="Times,serif" font-size="14.00">appprice: uint256</text>
-<text text-anchor="start" x="6037.49" y="-2017.9" font-family="Times,serif" font-size="14.00">volume: uint256</text>
-<text text-anchor="start" x="6037.49" y="-2001.1" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
-<text text-anchor="start" x="6037.49" y="-1984.3" font-family="Times,serif" font-size="14.00">datasetrestrict: address</text>
-<text text-anchor="start" x="6037.49" y="-1967.5" font-family="Times,serif" font-size="14.00">workerpoolrestrict: address</text>
-<text text-anchor="start" x="6037.49" y="-1950.7" font-family="Times,serif" font-size="14.00">requesterrestrict: address</text>
-<text text-anchor="start" x="6037.49" y="-1933.9" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
-<text text-anchor="start" x="6037.49" y="-1917.1" font-family="Times,serif" font-size="14.00">sign: bytes</text>
-</g>
-<!-- 14&#45;&gt;54 -->
+<!-- 12&#45;&gt;34 -->
+<g id="edge26" class="edge">
+<title>12&#45;&gt;34</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5072.14,-313.68C4805.9,-374.39 4482.79,-448.08 4214.66,-509.23"/>
+<polygon fill="black" stroke="black" points="4213.71,-505.85 4204.74,-511.49 4215.27,-512.68 4213.71,-505.85"/>
+</g>
+<!-- 12&#45;&gt;35 -->
 <g id="edge23" class="edge">
-<title>14&#45;&gt;54</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5086.41,-229.61C5622.97,-264.09 6286.73,-325.73 6373.1,-422.6 6567.94,-641.13 6288.89,-1568.5 6180.78,-1899.06"/>
-<polygon fill="black" stroke="black" points="6177.42,-1898.08 6177.63,-1908.67 6184.07,-1900.26 6177.42,-1898.08"/>
+<title>12&#45;&gt;35</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5232.35,-386.22C5211.99,-398.26 5191.95,-410.44 5172.61,-422.6 5142.25,-441.69 5110.85,-462.88 5080.45,-484.23"/>
+<polygon fill="black" stroke="black" points="5078.06,-481.63 5071.9,-490.25 5082.09,-487.35 5078.06,-481.63"/>
 </g>
-<!-- 55 -->
-<g id="node25" class="node">
-<title>55</title>
-<polygon fill="#f2f2f2" stroke="black" points="4574.49,-1908.9 4574.49,-2126.5 4797.71,-2126.5 4797.71,-1908.9 4574.49,-1908.9"/>
-<text text-anchor="middle" x="4686.1" y="-2109.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="4686.1" y="-2093.1" font-family="Times,serif" font-size="14.00">DatasetOrder</text>
-<text text-anchor="middle" x="4686.1" y="-2076.3" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="4574.49,-2068.1 4797.71,-2068.1 "/>
-<text text-anchor="start" x="4582.49" y="-2051.5" font-family="Times,serif" font-size="14.00">dataset: address</text>
-<text text-anchor="start" x="4582.49" y="-2034.7" font-family="Times,serif" font-size="14.00">datasetprice: uint256</text>
-<text text-anchor="start" x="4582.49" y="-2017.9" font-family="Times,serif" font-size="14.00">volume: uint256</text>
-<text text-anchor="start" x="4582.49" y="-2001.1" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
-<text text-anchor="start" x="4582.49" y="-1984.3" font-family="Times,serif" font-size="14.00">apprestrict: address</text>
-<text text-anchor="start" x="4582.49" y="-1967.5" font-family="Times,serif" font-size="14.00">workerpoolrestrict: address</text>
-<text text-anchor="start" x="4582.49" y="-1950.7" font-family="Times,serif" font-size="14.00">requesterrestrict: address</text>
-<text text-anchor="start" x="4582.49" y="-1933.9" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
-<text text-anchor="start" x="4582.49" y="-1917.1" font-family="Times,serif" font-size="14.00">sign: bytes</text>
-</g>
-<!-- 14&#45;&gt;55 -->
-<g id="edge18" class="edge">
-<title>14&#45;&gt;55</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4398.61,-302.33C4431.92,-641.21 4535.49,-1669.37 4580.1,-1813.6 4589.05,-1842.53 4602.05,-1872.22 4615.91,-1899.66"/>
-<polygon fill="black" stroke="black" points="4612.95,-1901.57 4620.63,-1908.87 4619.18,-1898.38 4612.95,-1901.57"/>
+<!-- 12&#45;&gt;36 -->
+<g id="edge21" class="edge">
+<title>12&#45;&gt;36</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5606.43,-386.41C5606.9,-398.65 5607.3,-410.8 5607.61,-422.6 5610.06,-515.95 5659.96,-765.48 5607.61,-842.8 5583.46,-878.47 5543.38,-844.28 5517.61,-878.8 5462.69,-952.38 5520.26,-1207.88 5479.61,-1290.2 5469.16,-1311.35 5450.07,-1304.59 5440.61,-1326.2 5397.17,-1425.42 5413.01,-1708.86 5440.61,-1813.6 5457.26,-1876.8 5498.58,-1940.99 5526.88,-1979.83"/>
+<polygon fill="black" stroke="black" points="5524.3,-1982.23 5533.06,-1988.2 5529.93,-1978.07 5524.3,-1982.23"/>
 </g>
-<!-- 56 -->
-<g id="node26" class="node">
-<title>56</title>
-<polygon fill="#f2f2f2" stroke="black" points="4333.49,-1892.1 4333.49,-2143.3 4556.71,-2143.3 4556.71,-1892.1 4333.49,-1892.1"/>
-<text text-anchor="middle" x="4445.1" y="-2126.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="4445.1" y="-2109.9" font-family="Times,serif" font-size="14.00">WorkerpoolOrder</text>
-<text text-anchor="middle" x="4445.1" y="-2093.1" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="4333.49,-2084.9 4556.71,-2084.9 "/>
-<text text-anchor="start" x="4341.49" y="-2068.3" font-family="Times,serif" font-size="14.00">workerpool: address</text>
-<text text-anchor="start" x="4341.49" y="-2051.5" font-family="Times,serif" font-size="14.00">workerpoolprice: uint256</text>
-<text text-anchor="start" x="4341.49" y="-2034.7" font-family="Times,serif" font-size="14.00">volume: uint256</text>
-<text text-anchor="start" x="4341.49" y="-2017.9" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
-<text text-anchor="start" x="4341.49" y="-2001.1" font-family="Times,serif" font-size="14.00">category: uint256</text>
-<text text-anchor="start" x="4341.49" y="-1984.3" font-family="Times,serif" font-size="14.00">trust: uint256</text>
-<text text-anchor="start" x="4341.49" y="-1967.5" font-family="Times,serif" font-size="14.00">apprestrict: address</text>
-<text text-anchor="start" x="4341.49" y="-1950.7" font-family="Times,serif" font-size="14.00">datasetrestrict: address</text>
-<text text-anchor="start" x="4341.49" y="-1933.9" font-family="Times,serif" font-size="14.00">requesterrestrict: address</text>
-<text text-anchor="start" x="4341.49" y="-1917.1" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
-<text text-anchor="start" x="4341.49" y="-1900.3" font-family="Times,serif" font-size="14.00">sign: bytes</text>
-</g>
-<!-- 14&#45;&gt;56 -->
+<!-- 12&#45;&gt;43 -->
+<g id="edge22" class="edge">
+<title>12&#45;&gt;43</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5610.76,-386.4C5619.76,-550.65 5621.22,-771.47 5571.61,-842.8 5547.71,-877.15 5516.17,-851.32 5484.61,-878.8 5474.23,-887.83 5464.52,-897.99 5455.48,-908.83"/>
+<polygon fill="black" stroke="black" points="5452.58,-906.86 5449.02,-916.84 5458.02,-911.26 5452.58,-906.86"/>
+</g>
+<!-- 46 -->
+<g id="node15" class="node">
+<title>46</title>
+<polygon fill="#f2f2f2" stroke="black" points="5526.44,-925.3 5526.44,-1243.7 5738.78,-1243.7 5738.78,-925.3 5526.44,-925.3"/>
+<text text-anchor="middle" x="5632.61" y="-1227.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="5632.61" y="-1210.3" font-family="Times,serif" font-size="14.00">Task</text>
+<text text-anchor="middle" x="5632.61" y="-1193.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polyline fill="none" stroke="black" points="5526.44,-1185.3 5738.78,-1185.3 "/>
+<text text-anchor="start" x="5534.44" y="-1168.7" font-family="Times,serif" font-size="14.00">status: TaskStatusEnum</text>
+<text text-anchor="start" x="5534.44" y="-1151.9" font-family="Times,serif" font-size="14.00">dealid: bytes32</text>
+<text text-anchor="start" x="5534.44" y="-1135.1" font-family="Times,serif" font-size="14.00">idx: uint256</text>
+<text text-anchor="start" x="5534.44" y="-1118.3" font-family="Times,serif" font-size="14.00">timeref: uint256</text>
+<text text-anchor="start" x="5534.44" y="-1101.5" font-family="Times,serif" font-size="14.00">contributionDeadline: uint256</text>
+<text text-anchor="start" x="5534.44" y="-1084.7" font-family="Times,serif" font-size="14.00">revealDeadline: uint256</text>
+<text text-anchor="start" x="5534.44" y="-1067.9" font-family="Times,serif" font-size="14.00">finalDeadline: uint256</text>
+<text text-anchor="start" x="5534.44" y="-1051.1" font-family="Times,serif" font-size="14.00">consensusValue: bytes32</text>
+<text text-anchor="start" x="5534.44" y="-1034.3" font-family="Times,serif" font-size="14.00">revealCounter: uint256</text>
+<text text-anchor="start" x="5534.44" y="-1017.5" font-family="Times,serif" font-size="14.00">winnerCounter: uint256</text>
+<text text-anchor="start" x="5534.44" y="-1000.7" font-family="Times,serif" font-size="14.00">contributors: address[]</text>
+<text text-anchor="start" x="5534.44" y="-983.9" font-family="Times,serif" font-size="14.00">resultDigest: bytes32</text>
+<text text-anchor="start" x="5534.44" y="-967.1" font-family="Times,serif" font-size="14.00">results: bytes</text>
+<text text-anchor="start" x="5534.44" y="-950.3" font-family="Times,serif" font-size="14.00">resultsTimestamp: uint256</text>
+<text text-anchor="start" x="5534.44" y="-933.5" font-family="Times,serif" font-size="14.00">resultsCallback: bytes</text>
+</g>
+<!-- 12&#45;&gt;46 -->
 <g id="edge24" class="edge">
-<title>14&#45;&gt;56</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4389.39,-302.38C4392.85,-562.64 4403.95,-1244.76 4431.1,-1813.6 4432.15,-1835.67 4433.53,-1859.06 4435,-1881.83"/>
-<polygon fill="black" stroke="black" points="4431.51,-1882.13 4435.66,-1891.88 4438.5,-1881.68 4431.51,-1882.13"/>
+<title>12&#45;&gt;46</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5642.55,-386.22C5644.55,-398.48 5646.27,-410.68 5647.61,-422.6 5666.34,-589.19 5658.81,-780.84 5648.89,-914.72"/>
+<polygon fill="black" stroke="black" points="5645.38,-914.83 5648.11,-925.06 5652.36,-915.35 5645.38,-914.83"/>
 </g>
-<!-- 57 -->
-<g id="node27" class="node">
-<title>57</title>
-<polygon fill="#f2f2f2" stroke="black" points="5788.49,-1850.1 5788.49,-2185.3 6011.71,-2185.3 6011.71,-1850.1 5788.49,-1850.1"/>
-<text text-anchor="middle" x="5900.1" y="-2168.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="5900.1" y="-2151.9" font-family="Times,serif" font-size="14.00">RequestOrder</text>
-<text text-anchor="middle" x="5900.1" y="-2135.1" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="5788.49,-2126.9 6011.71,-2126.9 "/>
-<text text-anchor="start" x="5796.49" y="-2110.3" font-family="Times,serif" font-size="14.00">app: address</text>
-<text text-anchor="start" x="5796.49" y="-2093.5" font-family="Times,serif" font-size="14.00">appmaxprice: uint256</text>
-<text text-anchor="start" x="5796.49" y="-2076.7" font-family="Times,serif" font-size="14.00">dataset: address</text>
-<text text-anchor="start" x="5796.49" y="-2059.9" font-family="Times,serif" font-size="14.00">datasetmaxprice: uint256</text>
-<text text-anchor="start" x="5796.49" y="-2043.1" font-family="Times,serif" font-size="14.00">workerpool: address</text>
-<text text-anchor="start" x="5796.49" y="-2026.3" font-family="Times,serif" font-size="14.00">workerpoolmaxprice: uint256</text>
-<text text-anchor="start" x="5796.49" y="-2009.5" font-family="Times,serif" font-size="14.00">requester: address</text>
-<text text-anchor="start" x="5796.49" y="-1992.7" font-family="Times,serif" font-size="14.00">volume: uint256</text>
-<text text-anchor="start" x="5796.49" y="-1975.9" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
-<text text-anchor="start" x="5796.49" y="-1959.1" font-family="Times,serif" font-size="14.00">category: uint256</text>
-<text text-anchor="start" x="5796.49" y="-1942.3" font-family="Times,serif" font-size="14.00">trust: uint256</text>
-<text text-anchor="start" x="5796.49" y="-1925.5" font-family="Times,serif" font-size="14.00">beneficiary: address</text>
-<text text-anchor="start" x="5796.49" y="-1908.7" font-family="Times,serif" font-size="14.00">callback: address</text>
-<text text-anchor="start" x="5796.49" y="-1891.9" font-family="Times,serif" font-size="14.00">params: string</text>
-<text text-anchor="start" x="5796.49" y="-1875.1" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
-<text text-anchor="start" x="5796.49" y="-1858.3" font-family="Times,serif" font-size="14.00">sign: bytes</text>
-</g>
-<!-- 14&#45;&gt;57 -->
+<!-- 47 -->
+<g id="node16" class="node">
+<title>47</title>
+<polygon fill="#f2f2f2" stroke="black" points="5717.36,-1519.9 5717.36,-1619.9 5933.85,-1619.9 5933.85,-1519.9 5717.36,-1519.9"/>
+<text text-anchor="middle" x="5825.61" y="-1603.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="5825.61" y="-1586.5" font-family="Times,serif" font-size="14.00">Consensus</text>
+<text text-anchor="middle" x="5825.61" y="-1569.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polyline fill="none" stroke="black" points="5717.36,-1561.5 5933.85,-1561.5 "/>
+<text text-anchor="start" x="5725.36" y="-1544.9" font-family="Times,serif" font-size="14.00">group: mapping(bytes32=&gt;uint256)</text>
+<text text-anchor="start" x="5725.36" y="-1528.1" font-family="Times,serif" font-size="14.00">total: uint256</text>
+</g>
+<!-- 12&#45;&gt;47 -->
+<g id="edge27" class="edge">
+<title>12&#45;&gt;47</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5657.2,-386.26C5660.54,-398.51 5663.71,-410.7 5666.61,-422.6 5766.08,-831.54 5809.22,-1338.73 5821.62,-1509.59"/>
+<polygon fill="black" stroke="black" points="5818.13,-1509.91 5822.34,-1519.64 5825.12,-1509.41 5818.13,-1509.91"/>
+</g>
+<!-- 49 -->
+<g id="node18" class="node">
+<title>49</title>
+<polygon fill="#f2f2f2" stroke="black" points="6018.44,-1009.3 6018.44,-1159.7 6230.78,-1159.7 6230.78,-1009.3 6018.44,-1009.3"/>
+<text text-anchor="middle" x="6124.61" y="-1143.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="6124.61" y="-1126.3" font-family="Times,serif" font-size="14.00">Contribution</text>
+<text text-anchor="middle" x="6124.61" y="-1109.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polyline fill="none" stroke="black" points="6018.44,-1101.3 6230.78,-1101.3 "/>
+<text text-anchor="start" x="6026.44" y="-1084.7" font-family="Times,serif" font-size="14.00">status: ContributionStatusEnum</text>
+<text text-anchor="start" x="6026.44" y="-1067.9" font-family="Times,serif" font-size="14.00">resultHash: bytes32</text>
+<text text-anchor="start" x="6026.44" y="-1051.1" font-family="Times,serif" font-size="14.00">resultSeal: bytes32</text>
+<text text-anchor="start" x="6026.44" y="-1034.3" font-family="Times,serif" font-size="14.00">enclaveChallenge: address</text>
+<text text-anchor="start" x="6026.44" y="-1017.5" font-family="Times,serif" font-size="14.00">weight: uint256</text>
+</g>
+<!-- 12&#45;&gt;49 -->
 <g id="edge25" class="edge">
-<title>14&#45;&gt;57</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5086.25,-231.48C5609.52,-266.7 6249.3,-328.39 6333.1,-422.6 6521.76,-634.7 6159.7,-1472.05 5985.85,-1840.79"/>
-<polygon fill="black" stroke="black" points="5982.63,-1839.41 5981.52,-1849.95 5988.96,-1842.4 5982.63,-1839.41"/>
+<title>12&#45;&gt;49</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5745.28,-386.19C5751.41,-398.18 5756.93,-410.36 5761.61,-422.6 5828.68,-597.94 5712.32,-679.32 5804.61,-842.8 5850.82,-924.66 5937.49,-987.19 6008.99,-1027.98"/>
+<polygon fill="black" stroke="black" points="6007.64,-1031.24 6018.07,-1033.1 6011.07,-1025.14 6007.64,-1031.24"/>
 </g>
-<!-- 14&#45;&gt;62 -->
+<!-- 12&#45;&gt;61 -->
 <g id="edge19" class="edge">
-<title>14&#45;&gt;62</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3690.05,-231.45C3151.06,-267.11 2481.94,-329.44 2390.1,-422.6 2369.93,-443.05 2341.17,-832.15 2329.41,-1003.56"/>
-<polygon fill="black" stroke="black" points="2325.92,-1003.32 2328.73,-1013.54 2332.91,-1003.8 2325.92,-1003.32"/>
+<title>12&#45;&gt;61</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5550.15,-386.1C5547.78,-398.42 5545.57,-410.67 5543.61,-422.6 5528.38,-515.22 5567.64,-777.09 5500.61,-842.8 5431.03,-911.02 5156.32,-848.82 5063.61,-878.8 4975.94,-907.15 4887.15,-961.91 4822.45,-1007.67"/>
+<polygon fill="black" stroke="black" points="4820.39,-1004.84 4814.28,-1013.49 4824.46,-1010.54 4820.39,-1004.84"/>
 </g>
-<!-- 14&#45;&gt;63 -->
+<!-- 12&#45;&gt;62 -->
 <g id="edge20" class="edge">
-<title>14&#45;&gt;63</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4371.57,-302.18C4365.99,-340.19 4359.96,-383.25 4355.1,-422.6 4343.61,-515.76 4369.75,-768.72 4312.1,-842.8 3892.72,-1381.73 3034.51,-1520.84 2595.65,-1556.62"/>
-<polygon fill="black" stroke="black" points="2595.05,-1553.15 2585.36,-1557.44 2595.61,-1560.13 2595.05,-1553.15"/>
-</g>
-<!-- 79 -->
-<g id="node35" class="node">
-<title>79</title>
-<polygon fill="#f2f2f2" stroke="black" points="5989.53,-557.5 5989.53,-707.9 6298.67,-707.9 6298.67,-557.5 5989.53,-557.5"/>
-<text text-anchor="middle" x="6144.1" y="-691.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
-<text text-anchor="middle" x="6144.1" y="-674.5" font-family="Times,serif" font-size="14.00">IWorkerpool</text>
-<text text-anchor="middle" x="6144.1" y="-657.7" font-family="Times,serif" font-size="14.00">contracts/registries/workerpools/IWorkerpool.v8.sol</text>
-<polyline fill="none" stroke="black" points="5989.53,-649.5 6298.67,-649.5 "/>
-<text text-anchor="start" x="5997.53" y="-632.9" font-family="Times,serif" font-size="14.00">External:</text>
-<text text-anchor="start" x="5997.53" y="-616.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;owner(): address</text>
-<text text-anchor="start" x="5997.53" y="-599.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;m_workerpoolDescription(): string</text>
-<text text-anchor="start" x="5997.53" y="-582.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;m_schedulerRewardRatioPolicy(): uint256</text>
-<text text-anchor="start" x="5997.53" y="-565.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;m_workerStakeRatioPolicy(): uint256</text>
-</g>
-<!-- 14&#45;&gt;79 -->
-<g id="edge27" class="edge">
-<title>14&#45;&gt;79</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5086.25,-243.16C5440.72,-278.04 5827.99,-334.69 5980.1,-422.6 6031.04,-452.04 6071.93,-504.04 6100.14,-548.82"/>
-<polygon fill="black" stroke="black" points="6097.19,-550.72 6105.43,-557.38 6103.15,-547.03 6097.19,-550.72"/>
+<title>12&#45;&gt;62</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5575.17,-386.1C5573.94,-398.45 5572.74,-410.7 5571.61,-422.6 5567.16,-469.25 5568.08,-809.01 5535.61,-842.8 5491.22,-888.99 5305.11,-846.81 5249.61,-878.8 5155.93,-932.79 5002.08,-1143.47 4885.08,-1318"/>
+<polygon fill="black" stroke="black" points="4882.02,-1316.29 4879.37,-1326.55 4887.84,-1320.18 4882.02,-1316.29"/>
 </g>
-<!-- 15 -->
-<g id="node7" class="node">
-<title>15</title>
-<polygon fill="#f2f2f2" stroke="black" points="740.73,-0.5 740.73,-386.1 1787.47,-386.1 1787.47,-0.5 740.73,-0.5"/>
-<text text-anchor="middle" x="1264.1" y="-369.5" font-family="Times,serif" font-size="14.00">IexecPoco2Facet</text>
-<text text-anchor="middle" x="1264.1" y="-352.7" font-family="Times,serif" font-size="14.00">contracts/facets/IexecPoco2Facet.sol</text>
-<polyline fill="none" stroke="black" points="740.73,-344.5 1787.47,-344.5 "/>
-<text text-anchor="start" x="748.73" y="-327.9" font-family="Times,serif" font-size="14.00">Internal:</text>
-<text text-anchor="start" x="748.73" y="-311.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;successWork(_dealid: bytes32, _taskid: bytes32)</text>
-<text text-anchor="start" x="748.73" y="-294.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;failedWork(_dealid: bytes32, _taskid: bytes32)</text>
-<text text-anchor="start" x="748.73" y="-277.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;checkConsensus(_taskid: bytes32, _consensus: bytes32)</text>
-<text text-anchor="start" x="748.73" y="-260.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;distributeRewards(_taskid: bytes32)</text>
-<text text-anchor="start" x="748.73" y="-243.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;distributeRewardsFast(_taskid: bytes32)</text>
-<text text-anchor="start" x="748.73" y="-227.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;executeCallback(_taskid: bytes32, _resultsCallback: bytes)</text>
-<text text-anchor="start" x="748.73" y="-210.3" font-family="Times,serif" font-size="14.00">External:</text>
-<text text-anchor="start" x="748.73" y="-193.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;contribute(_taskid: bytes32, _resultHash: bytes32, _resultSeal: bytes32, _enclaveChallenge: address, _enclaveSign: bytes, _authorizationSign: bytes)</text>
-<text text-anchor="start" x="748.73" y="-176.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;contributeAndFinalize(_taskid: bytes32, _resultDigest: bytes32, _results: bytes, _resultsCallback: bytes, _enclaveChallenge: address, _enclaveSign: bytes, _authorizationSign: bytes)</text>
-<text text-anchor="start" x="748.73" y="-159.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;reveal(_taskid: bytes32, _resultDigest: bytes32)</text>
-<text text-anchor="start" x="748.73" y="-143.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;reopen(_taskid: bytes32) &lt;&lt;onlyScheduler&gt;&gt;</text>
-<text text-anchor="start" x="748.73" y="-126.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;finalize(_taskid: bytes32, _results: bytes, _resultsCallback: bytes) &lt;&lt;onlyScheduler&gt;&gt;</text>
-<text text-anchor="start" x="748.73" y="-109.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;initializeArray(_dealid: bytes32[], _idx: uint256[]): bool</text>
-<text text-anchor="start" x="748.73" y="-92.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;claimArray(_taskid: bytes32[]): bool</text>
-<text text-anchor="start" x="748.73" y="-75.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;initializeAndClaimArray(_dealid: bytes32[], _idx: uint256[]): bool</text>
-<text text-anchor="start" x="748.73" y="-59.1" font-family="Times,serif" font-size="14.00">Public:</text>
-<text text-anchor="start" x="748.73" y="-42.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;modifier&gt;&gt; onlyScheduler(_taskId: bytes32)</text>
-<text text-anchor="start" x="748.73" y="-25.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;initialize(_dealid: bytes32, idx: uint256): bytes32</text>
-<text text-anchor="start" x="748.73" y="-8.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;claim(_taskid: bytes32)</text>
-</g>
-<!-- 15&#45;&gt;4 -->
-<g id="edge29" class="edge">
-<title>15&#45;&gt;4</title>
-<path fill="none" stroke="black" d="M1377.26,-386.15C1403.07,-429.9 1429.73,-475.1 1453.03,-514.61"/>
-<polygon fill="none" stroke="black" points="1444.1,-520.14 1468.39,-540.64 1462.19,-509.47 1444.1,-520.14"/>
+<!-- 24 -->
+<g id="node5" class="node">
+<title>24</title>
+<polygon fill="#f2f2f2" stroke="black" points="4455.7,-1967.7 4455.7,-2067.7 4725.51,-2067.7 4725.51,-1967.7 4455.7,-1967.7"/>
+<text text-anchor="middle" x="4590.61" y="-2051.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
+<text text-anchor="middle" x="4590.61" y="-2034.3" font-family="Times,serif" font-size="14.00">IexecHubV3Interface</text>
+<text text-anchor="middle" x="4590.61" y="-2017.5" font-family="Times,serif" font-size="14.00">contracts/interfaces/IexecHubV3Interface.sol</text>
+<polyline fill="none" stroke="black" points="4455.7,-2009.3 4725.51,-2009.3 "/>
+<text text-anchor="start" x="4463.7" y="-1992.7" font-family="Times,serif" font-size="14.00">External:</text>
+<text text-anchor="start" x="4463.7" y="-1975.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;viewScore(worker: address): uint256</text>
+</g>
+<!-- 26&#45;&gt;50 -->
+<g id="edge28" class="edge">
+<title>26&#45;&gt;50</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1187.77,-758.4C1165.48,-793.2 1140.62,-832.03 1116.05,-870.41"/>
+<polygon fill="black" stroke="black" points="1112.93,-868.79 1110.48,-879.1 1118.82,-872.57 1112.93,-868.79"/>
 </g>
-<!-- 15&#45;&gt;6 -->
+<!-- 26&#45;&gt;53 -->
 <g id="edge30" class="edge">
-<title>15&#45;&gt;6</title>
-<path fill="none" stroke="black" d="M1659.63,-386.11C1681.28,-398.13 1702.56,-410.34 1723.1,-422.6 1773.93,-452.95 1827.38,-489.24 1874.66,-523"/>
-<polygon fill="none" stroke="black" points="1868.67,-531.62 1899.14,-540.64 1880.95,-514.58 1868.67,-531.62"/>
+<title>26&#45;&gt;53</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1359.42,-758.51C1451.03,-891.43 1585.67,-1111.79 1639.61,-1326.2 1666.04,-1431.24 1687.98,-1716.69 1639.61,-1813.6 1608.09,-1876.75 1546.55,-1925.4 1490.18,-1959.24"/>
+<polygon fill="black" stroke="black" points="1488.38,-1956.24 1481.54,-1964.33 1491.94,-1962.27 1488.38,-1956.24"/>
 </g>
-<!-- 31 -->
-<g id="node12" class="node">
-<title>31</title>
-<polygon fill="#f2f2f2" stroke="black" points="158.1,-423.1 158.1,-842.3 1160.1,-842.3 1160.1,-423.1 158.1,-423.1"/>
-<text text-anchor="middle" x="659.1" y="-825.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
-<text text-anchor="middle" x="659.1" y="-808.9" font-family="Times,serif" font-size="14.00">IexecPoco2</text>
-<text text-anchor="middle" x="659.1" y="-792.1" font-family="Times,serif" font-size="14.00">contracts/interfaces/IexecPoco2.sol</text>
-<polyline fill="none" stroke="black" points="158.1,-783.9 1160.1,-783.9 "/>
-<text text-anchor="start" x="166.1" y="-767.3" font-family="Times,serif" font-size="14.00">External:</text>
-<text text-anchor="start" x="166.1" y="-750.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;initialize(dealId: bytes32, index: uint256): bytes32</text>
-<text text-anchor="start" x="166.1" y="-733.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;claim(taskId: bytes32)</text>
-<text text-anchor="start" x="166.1" y="-716.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;contribute(taskId: bytes32, resultHash: bytes32, resultSeal: bytes32, enclaveChallenge: address, enclaveSign: bytes, authorizationSign: bytes)</text>
-<text text-anchor="start" x="166.1" y="-700.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;contributeAndFinalize(taskId: bytes32, resultDigest: bytes32, results: bytes, resultsCallback: bytes, enclaveChallenge: address, enclaveSign: bytes, authorizationSign: bytes)</text>
-<text text-anchor="start" x="166.1" y="-683.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;reveal(taskId: bytes32, resultDigest: bytes32)</text>
-<text text-anchor="start" x="166.1" y="-666.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;reopen(taskId: bytes32)</text>
-<text text-anchor="start" x="166.1" y="-649.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;finalize(taskId: bytes32, results: bytes, resultsCallback: bytes)</text>
-<text text-anchor="start" x="166.1" y="-632.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;initializeArray(dealIds: bytes32[], indexes: uint256[]): bool</text>
-<text text-anchor="start" x="166.1" y="-616.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;claimArray(taskIds: bytes32[]): bool</text>
-<text text-anchor="start" x="166.1" y="-599.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;initializeAndClaimArray(dealIds: bytes32[], indexes: uint256[]): bool</text>
-<text text-anchor="start" x="166.1" y="-582.5" font-family="Times,serif" font-size="14.00">Public:</text>
-<text text-anchor="start" x="166.1" y="-565.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; AccurateContribution(worker: address, taskid: bytes32)</text>
-<text text-anchor="start" x="166.1" y="-548.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; FaultyContribution(worker: address, taskid: bytes32)</text>
-<text text-anchor="start" x="166.1" y="-532.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; TaskInitialize(taskid: bytes32, workerpool: address)</text>
-<text text-anchor="start" x="166.1" y="-515.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; TaskContribute(taskid: bytes32, worker: address, hash: bytes32)</text>
-<text text-anchor="start" x="166.1" y="-498.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; TaskConsensus(taskid: bytes32, consensus: bytes32)</text>
-<text text-anchor="start" x="166.1" y="-481.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; TaskReveal(taskid: bytes32, worker: address, digest: bytes32)</text>
-<text text-anchor="start" x="166.1" y="-464.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; TaskReopen(taskid: bytes32)</text>
-<text text-anchor="start" x="166.1" y="-448.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; TaskFinalize(taskid: bytes32, results: bytes)</text>
-<text text-anchor="start" x="166.1" y="-431.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; TaskClaimed(taskid: bytes32)</text>
-</g>
-<!-- 15&#45;&gt;31 -->
-<g id="edge28" class="edge">
-<title>15&#45;&gt;31</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M998.74,-386.15C990.06,-392.42 981.34,-398.73 972.61,-405.04"/>
-<polygon fill="none" stroke="black" points="966.16,-396.74 948,-422.83 978.47,-413.76 966.16,-396.74"/>
+<!-- 26&#45;&gt;54 -->
+<g id="edge29" class="edge">
+<title>26&#45;&gt;54</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1438.08,-758.61C1478.47,-794.1 1518.73,-835.09 1549.61,-878.8 1672.9,-1053.32 1683.07,-1116.8 1725.61,-1326.2 1765.76,-1523.83 1760.93,-1759.78 1752.88,-1898.42"/>
+<polygon fill="black" stroke="black" points="1749.38,-1898.45 1752.28,-1908.64 1756.36,-1898.87 1749.38,-1898.45"/>
+</g>
+<!-- 26&#45;&gt;55 -->
+<g id="edge31" class="edge">
+<title>26&#45;&gt;55</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M771.92,-717.9C578.16,-759.51 385.25,-814.61 313.61,-878.8 155.29,-1020.64 187.77,-1118.07 144.61,-1326.2 123.37,-1428.6 115.76,-1711.59 113.06,-1881.83"/>
+<polygon fill="black" stroke="black" points="109.56,-1881.82 112.9,-1891.87 116.56,-1881.93 109.56,-1881.82"/>
+</g>
+<!-- 26&#45;&gt;56 -->
+<g id="edge32" class="edge">
+<title>26&#45;&gt;56</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M938.05,-758.39C704.65,-867.61 413.46,-1052.19 298.61,-1326.2 229.71,-1490.57 258.7,-1696.08 295.32,-1839.98"/>
+<polygon fill="black" stroke="black" points="291.96,-1841 297.85,-1849.8 298.74,-1839.25 291.96,-1841"/>
 </g>
-<!-- 15&#45;&gt;37 -->
+<!-- 34&#45;&gt;61 -->
 <g id="edge33" class="edge">
-<title>15&#45;&gt;37</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M740.57,-229.39C461.11,-260.21 157.1,-317.39 70.1,-422.6 -131.69,-666.62 144.77,-1600.63 379.1,-1813.6 494.11,-1918.12 669.01,-1971.34 783.93,-1996.55"/>
-<polygon fill="black" stroke="black" points="783.31,-2000 793.82,-1998.68 784.78,-1993.15 783.31,-2000"/>
+<title>34&#45;&gt;61</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3957.5,-753.94C4159.14,-840.57 4422.83,-953.85 4582.66,-1022.52"/>
+<polygon fill="black" stroke="black" points="4581.52,-1025.84 4592.09,-1026.57 4584.28,-1019.4 4581.52,-1025.84"/>
 </g>
-<!-- 15&#45;&gt;44 -->
+<!-- 34&#45;&gt;62 -->
 <g id="edge34" class="edge">
-<title>15&#45;&gt;44</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1248.02,-386.43C1236.64,-515.62 1220.23,-689.63 1202.1,-842.8 1199.66,-863.42 1196.9,-885.01 1194.04,-906.43"/>
-<polygon fill="black" stroke="black" points="1190.53,-906.21 1192.67,-916.59 1197.47,-907.15 1190.53,-906.21"/>
+<title>34&#45;&gt;62</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3812.34,-754.05C3974.31,-898.71 4250.01,-1144.98 4456.03,-1329"/>
+<polygon fill="black" stroke="black" points="4453.84,-1331.74 4463.63,-1335.79 4458.5,-1326.52 4453.84,-1331.74"/>
 </g>
-<!-- 47 -->
-<g id="node17" class="node">
-<title>47</title>
-<polygon fill="#f2f2f2" stroke="black" points="525.93,-925.3 525.93,-1243.7 738.27,-1243.7 738.27,-925.3 525.93,-925.3"/>
-<text text-anchor="middle" x="632.1" y="-1227.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="632.1" y="-1210.3" font-family="Times,serif" font-size="14.00">Task</text>
-<text text-anchor="middle" x="632.1" y="-1193.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
-<polyline fill="none" stroke="black" points="525.93,-1185.3 738.27,-1185.3 "/>
-<text text-anchor="start" x="533.93" y="-1168.7" font-family="Times,serif" font-size="14.00">status: TaskStatusEnum</text>
-<text text-anchor="start" x="533.93" y="-1151.9" font-family="Times,serif" font-size="14.00">dealid: bytes32</text>
-<text text-anchor="start" x="533.93" y="-1135.1" font-family="Times,serif" font-size="14.00">idx: uint256</text>
-<text text-anchor="start" x="533.93" y="-1118.3" font-family="Times,serif" font-size="14.00">timeref: uint256</text>
-<text text-anchor="start" x="533.93" y="-1101.5" font-family="Times,serif" font-size="14.00">contributionDeadline: uint256</text>
-<text text-anchor="start" x="533.93" y="-1084.7" font-family="Times,serif" font-size="14.00">revealDeadline: uint256</text>
-<text text-anchor="start" x="533.93" y="-1067.9" font-family="Times,serif" font-size="14.00">finalDeadline: uint256</text>
-<text text-anchor="start" x="533.93" y="-1051.1" font-family="Times,serif" font-size="14.00">consensusValue: bytes32</text>
-<text text-anchor="start" x="533.93" y="-1034.3" font-family="Times,serif" font-size="14.00">revealCounter: uint256</text>
-<text text-anchor="start" x="533.93" y="-1017.5" font-family="Times,serif" font-size="14.00">winnerCounter: uint256</text>
-<text text-anchor="start" x="533.93" y="-1000.7" font-family="Times,serif" font-size="14.00">contributors: address[]</text>
-<text text-anchor="start" x="533.93" y="-983.9" font-family="Times,serif" font-size="14.00">resultDigest: bytes32</text>
-<text text-anchor="start" x="533.93" y="-967.1" font-family="Times,serif" font-size="14.00">results: bytes</text>
-<text text-anchor="start" x="533.93" y="-950.3" font-family="Times,serif" font-size="14.00">resultsTimestamp: uint256</text>
-<text text-anchor="start" x="533.93" y="-933.5" font-family="Times,serif" font-size="14.00">resultsCallback: bytes</text>
-</g>
-<!-- 15&#45;&gt;47 -->
+<!-- 35&#45;&gt;61 -->
 <g id="edge35" class="edge">
-<title>15&#45;&gt;47</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M740.73,-238.29C489.51,-271.38 226.4,-327.87 149.1,-422.6 90.06,-494.95 99.96,-763.4 149.1,-842.8 228.75,-971.49 400.21,-1033.61 515.89,-1061.93"/>
-<polygon fill="black" stroke="black" points="515.31,-1065.4 525.86,-1064.33 516.95,-1058.59 515.31,-1065.4"/>
+<title>35&#45;&gt;61</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4834.2,-775.4C4807.37,-850.84 4775.36,-940.82 4752.89,-1004"/>
+<polygon fill="black" stroke="black" points="4749.56,-1002.92 4749.5,-1013.52 4756.15,-1005.27 4749.56,-1002.92"/>
 </g>
-<!-- 48 -->
-<g id="node18" class="node">
-<title>48</title>
-<polygon fill="#f2f2f2" stroke="black" points="387.85,-1519.9 387.85,-1619.9 604.35,-1619.9 604.35,-1519.9 387.85,-1519.9"/>
-<text text-anchor="middle" x="496.1" y="-1603.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="496.1" y="-1586.5" font-family="Times,serif" font-size="14.00">Consensus</text>
-<text text-anchor="middle" x="496.1" y="-1569.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
-<polyline fill="none" stroke="black" points="387.85,-1561.5 604.35,-1561.5 "/>
-<text text-anchor="start" x="395.85" y="-1544.9" font-family="Times,serif" font-size="14.00">group: mapping(bytes32=&gt;uint256)</text>
-<text text-anchor="start" x="395.85" y="-1528.1" font-family="Times,serif" font-size="14.00">total: uint256</text>
-</g>
-<!-- 15&#45;&gt;48 -->
-<g id="edge37" class="edge">
-<title>15&#45;&gt;48</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M740.47,-233.31C473.81,-265.23 188.65,-322.19 106.1,-422.6 46.8,-494.73 83.32,-752.24 106.1,-842.8 174.28,-1113.83 365.44,-1393.95 452.24,-1511.53"/>
-<polygon fill="black" stroke="black" points="449.53,-1513.76 458.3,-1519.71 455.16,-1509.59 449.53,-1513.76"/>
-</g>
-<!-- 50 -->
-<g id="node20" class="node">
-<title>50</title>
-<polygon fill="#f2f2f2" stroke="black" points="812.93,-1009.3 812.93,-1159.7 1025.27,-1159.7 1025.27,-1009.3 812.93,-1009.3"/>
-<text text-anchor="middle" x="919.1" y="-1143.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="919.1" y="-1126.3" font-family="Times,serif" font-size="14.00">Contribution</text>
-<text text-anchor="middle" x="919.1" y="-1109.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
-<polyline fill="none" stroke="black" points="812.93,-1101.3 1025.27,-1101.3 "/>
-<text text-anchor="start" x="820.93" y="-1084.7" font-family="Times,serif" font-size="14.00">status: ContributionStatusEnum</text>
-<text text-anchor="start" x="820.93" y="-1067.9" font-family="Times,serif" font-size="14.00">resultHash: bytes32</text>
-<text text-anchor="start" x="820.93" y="-1051.1" font-family="Times,serif" font-size="14.00">resultSeal: bytes32</text>
-<text text-anchor="start" x="820.93" y="-1034.3" font-family="Times,serif" font-size="14.00">enclaveChallenge: address</text>
-<text text-anchor="start" x="820.93" y="-1017.5" font-family="Times,serif" font-size="14.00">weight: uint256</text>
-</g>
-<!-- 15&#45;&gt;50 -->
+<!-- 35&#45;&gt;62 -->
 <g id="edge36" class="edge">
-<title>15&#45;&gt;50</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1209.24,-386.17C1206.59,-398.44 1204.17,-410.66 1202.1,-422.6 1186.09,-514.89 1227.57,-769.62 1169.1,-842.8 1135.4,-884.97 1096.2,-846.3 1053.1,-878.8 1011.55,-910.13 979.08,-958.35 956.52,-1000.12"/>
-<polygon fill="black" stroke="black" points="953.29,-998.73 951.71,-1009.21 959.48,-1002.01 953.29,-998.73"/>
-</g>
-<!-- 15&#45;&gt;62 -->
-<g id="edge31" class="edge">
-<title>15&#45;&gt;62</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1787.57,-247.22C2014.4,-281.92 2244.17,-337.16 2314.1,-422.6 2350.05,-466.52 2336.4,-837.34 2328.35,-1003.51"/>
-<polygon fill="black" stroke="black" points="2324.85,-1003.51 2327.85,-1013.67 2331.84,-1003.86 2324.85,-1003.51"/>
-</g>
-<!-- 15&#45;&gt;63 -->
-<g id="edge32" class="edge">
-<title>15&#45;&gt;63</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1268.31,-386.32C1275.81,-691.27 1293.35,-1255.6 1321.1,-1290.2 1332.96,-1304.99 1760.11,-1420.1 2053.09,-1497.69"/>
-<polygon fill="black" stroke="black" points="2052.46,-1501.14 2063.02,-1500.32 2054.25,-1494.38 2052.46,-1501.14"/>
+<title>35&#45;&gt;62</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4898.09,-775.1C4906.84,-909.74 4909.59,-1116.97 4865.61,-1290.2 4863.35,-1299.08 4860.78,-1308 4857.95,-1316.91"/>
+<polygon fill="black" stroke="black" points="4854.57,-1315.99 4854.77,-1326.59 4861.22,-1318.18 4854.57,-1315.99"/>
 </g>
-<!-- 27 -->
-<g id="node9" class="node">
-<title>27</title>
-<polygon fill="#f2f2f2" stroke="black" points="2055.19,-1967.7 2055.19,-2067.7 2325.01,-2067.7 2325.01,-1967.7 2055.19,-1967.7"/>
-<text text-anchor="middle" x="2190.1" y="-2051.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
-<text text-anchor="middle" x="2190.1" y="-2034.3" font-family="Times,serif" font-size="14.00">IexecHubV3Interface</text>
-<text text-anchor="middle" x="2190.1" y="-2017.5" font-family="Times,serif" font-size="14.00">contracts/interfaces/IexecHubV3Interface.sol</text>
-<polyline fill="none" stroke="black" points="2055.19,-2009.3 2325.01,-2009.3 "/>
-<text text-anchor="start" x="2063.19" y="-1992.7" font-family="Times,serif" font-size="14.00">External:</text>
-<text text-anchor="start" x="2063.19" y="-1975.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;viewScore(worker: address): uint256</text>
-</g>
-<!-- 29&#45;&gt;51 -->
-<g id="edge38" class="edge">
-<title>29&#45;&gt;51</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5039.07,-758.4C5058.88,-793.2 5080.98,-832.03 5102.82,-870.41"/>
-<polygon fill="black" stroke="black" points="5099.78,-872.14 5107.77,-879.1 5105.86,-868.68 5099.78,-872.14"/>
+<!-- 42 -->
+<g id="node12" class="node">
+<title>42</title>
+<polygon fill="#f2f2f2" stroke="black" points="5143.44,-1511.5 5143.44,-1628.3 5355.78,-1628.3 5355.78,-1511.5 5143.44,-1511.5"/>
+<text text-anchor="middle" x="5249.61" y="-1611.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="5249.61" y="-1594.9" font-family="Times,serif" font-size="14.00">Resource</text>
+<text text-anchor="middle" x="5249.61" y="-1578.1" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polyline fill="none" stroke="black" points="5143.44,-1569.9 5355.78,-1569.9 "/>
+<text text-anchor="start" x="5151.44" y="-1553.3" font-family="Times,serif" font-size="14.00">pointer: address</text>
+<text text-anchor="start" x="5151.44" y="-1536.5" font-family="Times,serif" font-size="14.00">owner: address</text>
+<text text-anchor="start" x="5151.44" y="-1519.7" font-family="Times,serif" font-size="14.00">price: uint256</text>
+</g>
+<!-- 42&#45;&gt;36 -->
+<g id="edge39" class="edge">
+<title>42&#45;&gt;36</title>
+<path fill="none" stroke="black" d="M5272.52,-1628.33C5294.05,-1679.16 5328.98,-1754.26 5369.61,-1813.6 5413.18,-1877.24 5475.68,-1941.31 5515.97,-1980.01"/>
+<polygon fill="black" stroke="black" points="5516.02,-1980.06 5523.13,-1981.31 5524.71,-1988.34 5517.61,-1987.1 5516.02,-1980.06"/>
 </g>
-<!-- 29&#45;&gt;54 -->
+<!-- 43&#45;&gt;36 -->
 <g id="edge40" class="edge">
-<title>29&#45;&gt;54</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5233.25,-758.43C5309.32,-790.09 5393.3,-821.2 5473.1,-842.8 5586.98,-873.62 5639.15,-811.57 5736.1,-878.8 6074.56,-1113.53 6132.06,-1657.98 6140.5,-1898.66"/>
-<polygon fill="black" stroke="black" points="6137.01,-1898.96 6140.83,-1908.84 6144,-1898.73 6137.01,-1898.96"/>
+<title>43&#45;&gt;36</title>
+<path fill="none" stroke="black" d="M5369.51,-1252.24C5376.12,-1450.84 5389.21,-1762.31 5407.61,-1813.6 5430.96,-1878.72 5482.17,-1941.09 5517.76,-1979.13"/>
+<polygon fill="black" stroke="black" points="5518.18,-1979.57 5525.21,-1981.16 5526.45,-1988.26 5519.41,-1986.67 5518.18,-1979.57"/>
 </g>
-<!-- 29&#45;&gt;55 -->
-<g id="edge39" class="edge">
-<title>29&#45;&gt;55</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4882.01,-758.41C4795.52,-891.9 4667.97,-1113.33 4617.1,-1326.2 4566.75,-1536.89 4581.79,-1599.88 4617.1,-1813.6 4621.77,-1841.87 4629.86,-1871.48 4638.9,-1899.09"/>
-<polygon fill="black" stroke="black" points="4635.65,-1900.39 4642.14,-1908.76 4642.29,-1898.17 4635.65,-1900.39"/>
+<!-- 43&#45;&gt;42 -->
+<g id="edge44" class="edge">
+<title>43&#45;&gt;42</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5324.95,-1252.2C5304.61,-1337.71 5280.96,-1437.13 5265.66,-1501.44"/>
+<polygon fill="black" stroke="black" points="5262.19,-1500.91 5263.28,-1511.45 5269,-1502.53 5262.19,-1500.91"/>
 </g>
-<!-- 29&#45;&gt;56 -->
-<g id="edge41" class="edge">
-<title>29&#45;&gt;56</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4737.88,-758.54C4693.98,-792.16 4652.84,-832.34 4624.1,-878.8 4427.66,-1196.44 4422.57,-1656.21 4434.19,-1881.7"/>
-<polygon fill="black" stroke="black" points="4430.7,-1882.13 4434.73,-1891.93 4437.69,-1881.75 4430.7,-1882.13"/>
+<!-- 45 -->
+<g id="node14" class="node">
+<title>45</title>
+<polygon fill="#f2f2f2" stroke="black" points="5449.44,-1494.7 5449.44,-1645.1 5661.78,-1645.1 5661.78,-1494.7 5449.44,-1494.7"/>
+<text text-anchor="middle" x="5555.61" y="-1628.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Enum&gt;&gt;</text>
+<text text-anchor="middle" x="5555.61" y="-1611.7" font-family="Times,serif" font-size="14.00">TaskStatusEnum</text>
+<text text-anchor="middle" x="5555.61" y="-1594.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polyline fill="none" stroke="black" points="5449.44,-1586.7 5661.78,-1586.7 "/>
+<text text-anchor="start" x="5457.44" y="-1570.1" font-family="Times,serif" font-size="14.00">UNSET: 0</text>
+<text text-anchor="start" x="5457.44" y="-1553.3" font-family="Times,serif" font-size="14.00">ACTIVE: 1</text>
+<text text-anchor="start" x="5457.44" y="-1536.5" font-family="Times,serif" font-size="14.00">REVEALING: 2</text>
+<text text-anchor="start" x="5457.44" y="-1519.7" font-family="Times,serif" font-size="14.00">COMPLETED: 3</text>
+<text text-anchor="start" x="5457.44" y="-1502.9" font-family="Times,serif" font-size="14.00">FAILED: 4</text>
+</g>
+<!-- 45&#45;&gt;36 -->
+<g id="edge37" class="edge">
+<title>45&#45;&gt;36</title>
+<path fill="none" stroke="black" d="M5555.61,-1645.27C5555.61,-1740.34 5555.61,-1901.59 5555.61,-1976.38"/>
+<polygon fill="black" stroke="black" points="5555.61,-1976.46 5559.61,-1982.46 5555.61,-1988.46 5551.61,-1982.46 5555.61,-1976.46"/>
 </g>
-<!-- 29&#45;&gt;57 -->
-<g id="edge42" class="edge">
-<title>29&#45;&gt;57</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5293.7,-758.33C5526.69,-867.9 5819.59,-1052.97 5940.1,-1326.2 6012.1,-1489.45 5987.05,-1695.81 5953.35,-1840.24"/>
-<polygon fill="black" stroke="black" points="5949.91,-1839.56 5951.01,-1850.1 5956.72,-1841.17 5949.91,-1839.56"/>
+<!-- 46&#45;&gt;36 -->
+<g id="edge41" class="edge">
+<title>46&#45;&gt;36</title>
+<path fill="none" stroke="black" d="M5668.37,-1243.88C5695.72,-1393.32 5721,-1622.35 5670.61,-1813.6 5654.17,-1876.01 5613.67,-1939.37 5585.42,-1978.35"/>
+<polygon fill="black" stroke="black" points="5585.28,-1978.54 5584.94,-1985.74 5578.16,-1988.2 5578.5,-1980.99 5585.28,-1978.54"/>
 </g>
-<!-- 43 -->
-<g id="node14" class="node">
-<title>43</title>
-<polygon fill="#f2f2f2" stroke="black" points="1195.93,-1511.5 1195.93,-1628.3 1408.27,-1628.3 1408.27,-1511.5 1195.93,-1511.5"/>
-<text text-anchor="middle" x="1302.1" y="-1611.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="1302.1" y="-1594.9" font-family="Times,serif" font-size="14.00">Resource</text>
-<text text-anchor="middle" x="1302.1" y="-1578.1" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
-<polyline fill="none" stroke="black" points="1195.93,-1569.9 1408.27,-1569.9 "/>
-<text text-anchor="start" x="1203.93" y="-1553.3" font-family="Times,serif" font-size="14.00">pointer: address</text>
-<text text-anchor="start" x="1203.93" y="-1536.5" font-family="Times,serif" font-size="14.00">owner: address</text>
-<text text-anchor="start" x="1203.93" y="-1519.7" font-family="Times,serif" font-size="14.00">price: uint256</text>
-</g>
-<!-- 43&#45;&gt;37 -->
+<!-- 46&#45;&gt;45 -->
 <g id="edge45" class="edge">
-<title>43&#45;&gt;37</title>
-<path fill="none" stroke="black" d="M1282.8,-1628.47C1263.25,-1680.77 1229.2,-1758.01 1182.1,-1813.6 1120.25,-1886.6 1026.82,-1947.09 964.67,-1982.56"/>
-<polygon fill="black" stroke="black" points="964.66,-1982.57 961.4,-1989 954.21,-1988.46 957.47,-1982.03 964.66,-1982.57"/>
+<title>46&#45;&gt;45</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5607.4,-1243.78C5594.61,-1324.06 5579.59,-1418.32 5569.03,-1484.62"/>
+<polygon fill="black" stroke="black" points="5565.56,-1484.18 5567.44,-1494.61 5572.47,-1485.28 5565.56,-1484.18"/>
 </g>
-<!-- 44&#45;&gt;37 -->
-<g id="edge46" class="edge">
-<title>44&#45;&gt;37</title>
-<path fill="none" stroke="black" d="M1179.59,-1252.3C1189.5,-1436.17 1195.77,-1718.54 1149.1,-1813.6 1111.18,-1890.84 1028.57,-1948.73 968.88,-1982.55"/>
-<polygon fill="black" stroke="black" points="968.88,-1982.55 965.58,-1988.96 958.39,-1988.38 961.69,-1981.97 968.88,-1982.55"/>
+<!-- 47&#45;&gt;36 -->
+<g id="edge42" class="edge">
+<title>47&#45;&gt;36</title>
+<path fill="none" stroke="black" d="M5803.8,-1620.05C5780.97,-1669.99 5743.03,-1748.98 5703.61,-1813.6 5666.85,-1873.86 5617.44,-1939.07 5586.05,-1978.91"/>
+<polygon fill="black" stroke="black" points="5585.93,-1979.07 5585.34,-1986.25 5578.48,-1988.47 5579.07,-1981.29 5585.93,-1979.07"/>
 </g>
-<!-- 44&#45;&gt;43 -->
-<g id="edge50" class="edge">
-<title>44&#45;&gt;43</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1214.31,-1252.2C1238.01,-1337.71 1265.57,-1437.13 1283.4,-1501.44"/>
-<polygon fill="black" stroke="black" points="1280.13,-1502.75 1286.17,-1511.45 1286.88,-1500.88 1280.13,-1502.75"/>
+<!-- 48 -->
+<g id="node17" class="node">
+<title>48</title>
+<polygon fill="#f2f2f2" stroke="black" points="5951.44,-1503.1 5951.44,-1636.7 6163.78,-1636.7 6163.78,-1503.1 5951.44,-1503.1"/>
+<text text-anchor="middle" x="6057.61" y="-1620.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Enum&gt;&gt;</text>
+<text text-anchor="middle" x="6057.61" y="-1603.3" font-family="Times,serif" font-size="14.00">ContributionStatusEnum</text>
+<text text-anchor="middle" x="6057.61" y="-1586.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polyline fill="none" stroke="black" points="5951.44,-1578.3 6163.78,-1578.3 "/>
+<text text-anchor="start" x="5959.44" y="-1561.7" font-family="Times,serif" font-size="14.00">UNSET: 0</text>
+<text text-anchor="start" x="5959.44" y="-1544.9" font-family="Times,serif" font-size="14.00">CONTRIBUTED: 1</text>
+<text text-anchor="start" x="5959.44" y="-1528.1" font-family="Times,serif" font-size="14.00">PROVED: 2</text>
+<text text-anchor="start" x="5959.44" y="-1511.3" font-family="Times,serif" font-size="14.00">REJECTED: 3</text>
+</g>
+<!-- 48&#45;&gt;36 -->
+<g id="edge38" class="edge">
+<title>48&#45;&gt;36</title>
+<path fill="none" stroke="black" d="M6039.17,-1636.92C6021.58,-1689.98 5990.56,-1763.65 5942.61,-1813.6 5863.02,-1896.5 5742.16,-1952.4 5656.71,-1984.22"/>
+<polygon fill="black" stroke="black" points="5656.68,-1984.23 5652.43,-1990.05 5645.42,-1988.37 5649.67,-1982.54 5656.68,-1984.23"/>
 </g>
-<!-- 46 -->
-<g id="node16" class="node">
-<title>46</title>
-<polygon fill="#f2f2f2" stroke="black" points="659.93,-1494.7 659.93,-1645.1 872.27,-1645.1 872.27,-1494.7 659.93,-1494.7"/>
-<text text-anchor="middle" x="766.1" y="-1628.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Enum&gt;&gt;</text>
-<text text-anchor="middle" x="766.1" y="-1611.7" font-family="Times,serif" font-size="14.00">TaskStatusEnum</text>
-<text text-anchor="middle" x="766.1" y="-1594.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
-<polyline fill="none" stroke="black" points="659.93,-1586.7 872.27,-1586.7 "/>
-<text text-anchor="start" x="667.93" y="-1570.1" font-family="Times,serif" font-size="14.00">UNSET: 0</text>
-<text text-anchor="start" x="667.93" y="-1553.3" font-family="Times,serif" font-size="14.00">ACTIVE: 1</text>
-<text text-anchor="start" x="667.93" y="-1536.5" font-family="Times,serif" font-size="14.00">REVEALING: 2</text>
-<text text-anchor="start" x="667.93" y="-1519.7" font-family="Times,serif" font-size="14.00">COMPLETED: 3</text>
-<text text-anchor="start" x="667.93" y="-1502.9" font-family="Times,serif" font-size="14.00">FAILED: 4</text>
-</g>
-<!-- 46&#45;&gt;37 -->
+<!-- 49&#45;&gt;36 -->
 <g id="edge43" class="edge">
-<title>46&#45;&gt;37</title>
-<path fill="none" stroke="black" d="M788.45,-1645.27C817.09,-1740.54 865.7,-1902.26 888.12,-1976.84"/>
-<polygon fill="black" stroke="black" points="888.16,-1976.97 893.72,-1981.57 891.61,-1988.46 886.06,-1983.87 888.16,-1976.97"/>
-</g>
-<!-- 47&#45;&gt;37 -->
-<g id="edge47" class="edge">
-<title>47&#45;&gt;37</title>
-<path fill="none" stroke="black" d="M621.08,-1243.73C610.91,-1427.27 603.7,-1717.05 651.1,-1813.6 689.02,-1890.84 771.63,-1948.73 831.32,-1982.55"/>
-<polygon fill="black" stroke="black" points="831.32,-1982.55 838.51,-1981.97 841.81,-1988.38 834.62,-1988.96 831.32,-1982.55"/>
-</g>
-<!-- 47&#45;&gt;46 -->
-<g id="edge51" class="edge">
-<title>47&#45;&gt;46</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M675.98,-1243.78C698.23,-1324.06 724.36,-1418.32 742.74,-1484.62"/>
-<polygon fill="black" stroke="black" points="739.46,-1485.9 745.51,-1494.61 746.21,-1484.03 739.46,-1485.9"/>
-</g>
-<!-- 48&#45;&gt;37 -->
-<g id="edge48" class="edge">
-<title>48&#45;&gt;37</title>
-<path fill="none" stroke="black" d="M512.78,-1620.08C532.18,-1672.21 568.06,-1754.94 618.1,-1813.6 680.19,-1886.39 773.56,-1946.93 835.64,-1982.47"/>
-<polygon fill="black" stroke="black" points="835.64,-1982.47 842.83,-1981.95 846.09,-1988.39 838.89,-1988.91 835.64,-1982.47"/>
+<title>49&#45;&gt;36</title>
+<path fill="none" stroke="black" d="M6157.83,-1159.82C6215.74,-1301.87 6316.03,-1615.4 6172.61,-1813.6 6113.51,-1895.27 5836.05,-1961.92 5674.04,-1994.7"/>
+<polygon fill="black" stroke="black" points="5673.86,-1994.74 5668.77,-1999.84 5662.1,-1997.1 5667.19,-1991.99 5673.86,-1994.74"/>
 </g>
-<!-- 49 -->
-<g id="node19" class="node">
-<title>49</title>
-<polygon fill="#f2f2f2" stroke="black" points="927.93,-1503.1 927.93,-1636.7 1140.27,-1636.7 1140.27,-1503.1 927.93,-1503.1"/>
-<text text-anchor="middle" x="1034.1" y="-1620.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Enum&gt;&gt;</text>
-<text text-anchor="middle" x="1034.1" y="-1603.3" font-family="Times,serif" font-size="14.00">ContributionStatusEnum</text>
-<text text-anchor="middle" x="1034.1" y="-1586.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
-<polyline fill="none" stroke="black" points="927.93,-1578.3 1140.27,-1578.3 "/>
-<text text-anchor="start" x="935.93" y="-1561.7" font-family="Times,serif" font-size="14.00">UNSET: 0</text>
-<text text-anchor="start" x="935.93" y="-1544.9" font-family="Times,serif" font-size="14.00">CONTRIBUTED: 1</text>
-<text text-anchor="start" x="935.93" y="-1528.1" font-family="Times,serif" font-size="14.00">PROVED: 2</text>
-<text text-anchor="start" x="935.93" y="-1511.3" font-family="Times,serif" font-size="14.00">REJECTED: 3</text>
-</g>
-<!-- 49&#45;&gt;37 -->
-<g id="edge44" class="edge">
-<title>49&#45;&gt;37</title>
-<path fill="none" stroke="black" d="M1014.18,-1637.16C985.95,-1731.09 935.15,-1900.08 912.08,-1976.83"/>
-<polygon fill="black" stroke="black" points="912.08,-1976.84 914.19,-1983.74 908.63,-1988.33 906.52,-1981.43 912.08,-1976.84"/>
-</g>
-<!-- 50&#45;&gt;37 -->
-<g id="edge49" class="edge">
-<title>50&#45;&gt;37</title>
-<path fill="none" stroke="black" d="M917.59,-1159.74C913.77,-1346.7 903.86,-1832.25 900.93,-1976.02"/>
-<polygon fill="black" stroke="black" points="900.93,-1976.09 904.81,-1982.17 900.68,-1988.08 896.81,-1982 900.93,-1976.09"/>
+<!-- 49&#45;&gt;48 -->
+<g id="edge46" class="edge">
+<title>49&#45;&gt;48</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M6114.32,-1159.71C6101.81,-1250.01 6080.79,-1401.69 6068.15,-1492.83"/>
+<polygon fill="black" stroke="black" points="6064.67,-1492.43 6066.77,-1502.81 6071.61,-1493.39 6064.67,-1492.43"/>
 </g>
-<!-- 50&#45;&gt;49 -->
-<g id="edge52" class="edge">
-<title>50&#45;&gt;49</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M936.75,-1159.71C958.24,-1250.01 994.32,-1401.69 1016,-1492.83"/>
-<polygon fill="black" stroke="black" points="1012.66,-1493.9 1018.38,-1502.81 1019.47,-1492.28 1012.66,-1493.9"/>
+<!-- 52 -->
+<g id="node21" class="node">
+<title>52</title>
+<polygon fill="#f2f2f2" stroke="black" points="1109,-1503.1 1109,-1636.7 1332.22,-1636.7 1332.22,-1503.1 1109,-1503.1"/>
+<text text-anchor="middle" x="1220.61" y="-1620.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="1220.61" y="-1603.3" font-family="Times,serif" font-size="14.00">EIP712Domain</text>
+<text text-anchor="middle" x="1220.61" y="-1586.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="1109,-1578.3 1332.22,-1578.3 "/>
+<text text-anchor="start" x="1117" y="-1561.7" font-family="Times,serif" font-size="14.00">name: string</text>
+<text text-anchor="start" x="1117" y="-1544.9" font-family="Times,serif" font-size="14.00">version: string</text>
+<text text-anchor="start" x="1117" y="-1528.1" font-family="Times,serif" font-size="14.00">chainId: uint256</text>
+<text text-anchor="start" x="1117" y="-1511.3" font-family="Times,serif" font-size="14.00">verifyingContract: address</text>
+</g>
+<!-- 50&#45;&gt;52 -->
+<g id="edge57" class="edge">
+<title>50&#45;&gt;52</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1073.53,-1289.98C1079.65,-1302.23 1085.71,-1314.38 1091.61,-1326.2 1119.59,-1382.32 1150.99,-1445.85 1175.93,-1493.84"/>
+<polygon fill="black" stroke="black" points="1172.94,-1495.67 1180.67,-1502.92 1179.14,-1492.43 1172.94,-1495.67"/>
 </g>
-<!-- 53 -->
-<g id="node23" class="node">
-<title>53</title>
-<polygon fill="#f2f2f2" stroke="black" points="5664.49,-1503.1 5664.49,-1636.7 5887.71,-1636.7 5887.71,-1503.1 5664.49,-1503.1"/>
-<text text-anchor="middle" x="5776.1" y="-1620.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="5776.1" y="-1603.3" font-family="Times,serif" font-size="14.00">EIP712Domain</text>
-<text text-anchor="middle" x="5776.1" y="-1586.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="5664.49,-1578.3 5887.71,-1578.3 "/>
-<text text-anchor="start" x="5672.49" y="-1561.7" font-family="Times,serif" font-size="14.00">name: string</text>
-<text text-anchor="start" x="5672.49" y="-1544.9" font-family="Times,serif" font-size="14.00">version: string</text>
-<text text-anchor="start" x="5672.49" y="-1528.1" font-family="Times,serif" font-size="14.00">chainId: uint256</text>
-<text text-anchor="start" x="5672.49" y="-1511.3" font-family="Times,serif" font-size="14.00">verifyingContract: address</text>
-</g>
-<!-- 51&#45;&gt;53 -->
-<g id="edge63" class="edge">
-<title>51&#45;&gt;53</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5440.96,-1178.33C5512.96,-1216.21 5589.38,-1265.57 5647.1,-1326.2 5692.33,-1373.71 5723.91,-1441.55 5744.74,-1493.44"/>
-<polygon fill="black" stroke="black" points="5741.56,-1494.92 5748.5,-1502.93 5748.07,-1492.34 5741.56,-1494.92"/>
+<!-- 50&#45;&gt;53 -->
+<g id="edge58" class="edge">
+<title>50&#45;&gt;53</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1196.69,-1188.74C1250.1,-1224.43 1300.98,-1269.95 1332.61,-1326.2 1385.91,-1420.98 1377.77,-1727.72 1371.67,-1898.75"/>
+<polygon fill="black" stroke="black" points="1368.17,-1898.68 1371.3,-1908.8 1375.16,-1898.93 1368.17,-1898.68"/>
 </g>
-<!-- 51&#45;&gt;54 -->
-<g id="edge64" class="edge">
-<title>51&#45;&gt;54</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5441.08,-1106.53C5597.41,-1132.9 5802.61,-1192.32 5931.1,-1326.2 5971.26,-1368.04 6059,-1712.88 6107.55,-1898.85"/>
-<polygon fill="black" stroke="black" points="6104.2,-1899.89 6110.11,-1908.68 6110.97,-1898.12 6104.2,-1899.89"/>
+<!-- 50&#45;&gt;54 -->
+<g id="edge59" class="edge">
+<title>50&#45;&gt;54</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1196.71,-1108.94C1341.61,-1136.45 1524.37,-1196.24 1630.61,-1326.2 1763.74,-1489.06 1764.18,-1748.36 1753.44,-1898.56"/>
+<polygon fill="black" stroke="black" points="1749.94,-1898.5 1752.69,-1908.73 1756.92,-1899.02 1749.94,-1898.5"/>
 </g>
-<!-- 51&#45;&gt;55 -->
-<g id="edge65" class="edge">
-<title>51&#45;&gt;55</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5007.07,-1114.95C4877.66,-1144.95 4723.42,-1205.26 4643.1,-1326.2 4582.77,-1417.05 4625.22,-1726.85 4658.16,-1898.99"/>
-<polygon fill="black" stroke="black" points="4654.73,-1899.7 4660.06,-1908.85 4661.6,-1898.37 4654.73,-1899.7"/>
+<!-- 50&#45;&gt;55 -->
+<g id="edge60" class="edge">
+<title>50&#45;&gt;55</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M762.53,-1107.94C609.75,-1135.02 411.54,-1194.72 289.61,-1326.2 215.01,-1406.64 154.32,-1704.88 126.82,-1882.02"/>
+<polygon fill="black" stroke="black" points="123.36,-1881.52 125.3,-1891.93 130.28,-1882.58 123.36,-1881.52"/>
 </g>
-<!-- 51&#45;&gt;56 -->
-<g id="edge66" class="edge">
-<title>51&#45;&gt;56</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5007.07,-1118.26C4873.52,-1149.68 4709.17,-1210.34 4608.1,-1326.2 4461.44,-1494.31 4542.43,-1597.23 4488.1,-1813.6 4482.53,-1835.76 4476.57,-1859.27 4470.87,-1882.13"/>
-<polygon fill="black" stroke="black" points="4467.47,-1881.33 4468.45,-1891.88 4474.26,-1883.02 4467.47,-1881.33"/>
+<!-- 50&#45;&gt;56 -->
+<g id="edge61" class="edge">
+<title>50&#45;&gt;56</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M762.45,-1103.27C613.21,-1128 425.23,-1186.78 328.61,-1326.2 273.1,-1406.3 294.13,-1663.08 319.19,-1839.87"/>
+<polygon fill="black" stroke="black" points="315.73,-1840.4 320.61,-1849.81 322.66,-1839.41 315.73,-1840.4"/>
 </g>
-<!-- 51&#45;&gt;57 -->
-<g id="edge67" class="edge">
-<title>51&#45;&gt;57</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5441.24,-1101.18C5593.48,-1124.97 5787.12,-1183.5 5888.1,-1326.2 5944.4,-1405.75 5930.39,-1662.8 5914.98,-1839.78"/>
-<polygon fill="black" stroke="black" points="5911.47,-1839.72 5914.08,-1849.99 5918.45,-1840.34 5911.47,-1839.72"/>
+<!-- 57 -->
+<g id="node26" class="node">
+<title>57</title>
+<polygon fill="#f2f2f2" stroke="black" points="868,-1511.5 868,-1628.3 1091.22,-1628.3 1091.22,-1511.5 868,-1511.5"/>
+<text text-anchor="middle" x="979.61" y="-1611.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="979.61" y="-1594.9" font-family="Times,serif" font-size="14.00">AppOrderOperation</text>
+<text text-anchor="middle" x="979.61" y="-1578.1" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="868,-1569.9 1091.22,-1569.9 "/>
+<text text-anchor="start" x="876" y="-1553.3" font-family="Times,serif" font-size="14.00">order: AppOrder</text>
+<text text-anchor="start" x="876" y="-1536.5" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
+<text text-anchor="start" x="876" y="-1519.7" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+</g>
+<!-- 50&#45;&gt;57 -->
+<g id="edge62" class="edge">
+<title>50&#45;&gt;57</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M972.93,-1289.8C972.64,-1365.45 973.24,-1446.11 974.75,-1501.16"/>
+<polygon fill="black" stroke="black" points="971.26,-1501.58 975.05,-1511.48 978.26,-1501.38 971.26,-1501.58"/>
 </g>
 <!-- 58 -->
-<g id="node28" class="node">
+<g id="node27" class="node">
 <title>58</title>
-<polygon fill="#f2f2f2" stroke="black" points="5423.49,-1511.5 5423.49,-1628.3 5646.71,-1628.3 5646.71,-1511.5 5423.49,-1511.5"/>
-<text text-anchor="middle" x="5535.1" y="-1611.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="5535.1" y="-1594.9" font-family="Times,serif" font-size="14.00">AppOrderOperation</text>
-<text text-anchor="middle" x="5535.1" y="-1578.1" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="5423.49,-1569.9 5646.71,-1569.9 "/>
-<text text-anchor="start" x="5431.49" y="-1553.3" font-family="Times,serif" font-size="14.00">order: AppOrder</text>
-<text text-anchor="start" x="5431.49" y="-1536.5" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
-<text text-anchor="start" x="5431.49" y="-1519.7" font-family="Times,serif" font-size="14.00">sign: bytes</text>
-</g>
-<!-- 51&#45;&gt;58 -->
-<g id="edge68" class="edge">
-<title>51&#45;&gt;58</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5381.91,-1289.87C5390.33,-1301.99 5398.46,-1314.15 5406.1,-1326.2 5442.11,-1383.01 5475.36,-1452.14 5499.25,-1502.07"/>
-<polygon fill="black" stroke="black" points="5496.13,-1503.65 5503.6,-1511.16 5502.44,-1500.63 5496.13,-1503.65"/>
+<polygon fill="#f2f2f2" stroke="black" points="1407,-1511.5 1407,-1628.3 1630.22,-1628.3 1630.22,-1511.5 1407,-1511.5"/>
+<text text-anchor="middle" x="1518.61" y="-1611.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="1518.61" y="-1594.9" font-family="Times,serif" font-size="14.00">DatasetOrderOperation</text>
+<text text-anchor="middle" x="1518.61" y="-1578.1" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="1407,-1569.9 1630.22,-1569.9 "/>
+<text text-anchor="start" x="1415" y="-1553.3" font-family="Times,serif" font-size="14.00">order: DatasetOrder</text>
+<text text-anchor="start" x="1415" y="-1536.5" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
+<text text-anchor="start" x="1415" y="-1519.7" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+</g>
+<!-- 50&#45;&gt;58 -->
+<g id="edge63" class="edge">
+<title>50&#45;&gt;58</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1196.45,-1186.61C1262.07,-1223.77 1330.67,-1270.61 1383.61,-1326.2 1431.79,-1376.79 1466.22,-1449.42 1488.49,-1502.03"/>
+<polygon fill="black" stroke="black" points="1485.27,-1503.42 1492.37,-1511.28 1491.73,-1500.71 1485.27,-1503.42"/>
 </g>
 <!-- 59 -->
-<g id="node29" class="node">
+<g id="node28" class="node">
 <title>59</title>
-<polygon fill="#f2f2f2" stroke="black" points="4902.49,-1511.5 4902.49,-1628.3 5125.71,-1628.3 5125.71,-1511.5 4902.49,-1511.5"/>
-<text text-anchor="middle" x="5014.1" y="-1611.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="5014.1" y="-1594.9" font-family="Times,serif" font-size="14.00">DatasetOrderOperation</text>
-<text text-anchor="middle" x="5014.1" y="-1578.1" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="4902.49,-1569.9 5125.71,-1569.9 "/>
-<text text-anchor="start" x="4910.49" y="-1553.3" font-family="Times,serif" font-size="14.00">order: DatasetOrder</text>
-<text text-anchor="start" x="4910.49" y="-1536.5" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
-<text text-anchor="start" x="4910.49" y="-1519.7" font-family="Times,serif" font-size="14.00">sign: bytes</text>
-</g>
-<!-- 51&#45;&gt;59 -->
-<g id="edge69" class="edge">
-<title>51&#45;&gt;59</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5128.67,-1289.8C5095.3,-1365.92 5060.65,-1447.12 5038.25,-1502.19"/>
-<polygon fill="black" stroke="black" points="5035,-1500.89 5034.49,-1511.48 5041.49,-1503.52 5035,-1500.89"/>
+<polygon fill="#f2f2f2" stroke="black" points="347,-1511.5 347,-1628.3 570.22,-1628.3 570.22,-1511.5 347,-1511.5"/>
+<text text-anchor="middle" x="458.61" y="-1611.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="458.61" y="-1594.9" font-family="Times,serif" font-size="14.00">WorkerpoolOrderOperation</text>
+<text text-anchor="middle" x="458.61" y="-1578.1" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="347,-1569.9 570.22,-1569.9 "/>
+<text text-anchor="start" x="355" y="-1553.3" font-family="Times,serif" font-size="14.00">order: WorkerpoolOrder</text>
+<text text-anchor="start" x="355" y="-1536.5" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
+<text text-anchor="start" x="355" y="-1519.7" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+</g>
+<!-- 50&#45;&gt;59 -->
+<g id="edge64" class="edge">
+<title>50&#45;&gt;59</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M762.78,-1180.67C694.76,-1218.83 623.47,-1267.76 569.61,-1326.2 522.82,-1376.96 490.23,-1449.35 472.63,-1501.85"/>
+<polygon fill="black" stroke="black" points="469.29,-1500.82 469.52,-1511.41 475.94,-1502.99 469.29,-1500.82"/>
 </g>
 <!-- 60 -->
-<g id="node30" class="node">
+<g id="node29" class="node">
 <title>60</title>
-<polygon fill="#f2f2f2" stroke="black" points="4661.49,-1511.5 4661.49,-1628.3 4884.71,-1628.3 4884.71,-1511.5 4661.49,-1511.5"/>
-<text text-anchor="middle" x="4773.1" y="-1611.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="4773.1" y="-1594.9" font-family="Times,serif" font-size="14.00">WorkerpoolOrderOperation</text>
-<text text-anchor="middle" x="4773.1" y="-1578.1" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="4661.49,-1569.9 4884.71,-1569.9 "/>
-<text text-anchor="start" x="4669.49" y="-1553.3" font-family="Times,serif" font-size="14.00">order: WorkerpoolOrder</text>
-<text text-anchor="start" x="4669.49" y="-1536.5" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
-<text text-anchor="start" x="4669.49" y="-1519.7" font-family="Times,serif" font-size="14.00">sign: bytes</text>
-</g>
-<!-- 51&#45;&gt;60 -->
-<g id="edge70" class="edge">
-<title>51&#45;&gt;60</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5007.03,-1213.28C4962.8,-1246.44 4919.14,-1284.65 4884.1,-1326.2 4839.97,-1378.52 4807.22,-1449.85 4788.84,-1501.63"/>
-<polygon fill="black" stroke="black" points="4785.42,-1500.79 4785.46,-1511.38 4792.04,-1503.08 4785.42,-1500.79"/>
+<polygon fill="#f2f2f2" stroke="black" points="588,-1511.5 588,-1628.3 811.22,-1628.3 811.22,-1511.5 588,-1511.5"/>
+<text text-anchor="middle" x="699.61" y="-1611.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="699.61" y="-1594.9" font-family="Times,serif" font-size="14.00">RequestOrderOperation</text>
+<text text-anchor="middle" x="699.61" y="-1578.1" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="588,-1569.9 811.22,-1569.9 "/>
+<text text-anchor="start" x="596" y="-1553.3" font-family="Times,serif" font-size="14.00">order: RequestOrder</text>
+<text text-anchor="start" x="596" y="-1536.5" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
+<text text-anchor="start" x="596" y="-1519.7" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+</g>
+<!-- 50&#45;&gt;60 -->
+<g id="edge65" class="edge">
+<title>50&#45;&gt;60</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M838.08,-1289.9C830.7,-1302.12 823.5,-1314.28 816.61,-1326.2 782.91,-1384.51 747.87,-1452.72 724.85,-1501.96"/>
+<polygon fill="black" stroke="black" points="721.58,-1500.69 720.56,-1511.23 727.93,-1503.63 721.58,-1500.69"/>
 </g>
-<!-- 61 -->
-<g id="node31" class="node">
-<title>61</title>
-<polygon fill="#f2f2f2" stroke="black" points="5182.49,-1511.5 5182.49,-1628.3 5405.71,-1628.3 5405.71,-1511.5 5182.49,-1511.5"/>
-<text text-anchor="middle" x="5294.1" y="-1611.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="5294.1" y="-1594.9" font-family="Times,serif" font-size="14.00">RequestOrderOperation</text>
-<text text-anchor="middle" x="5294.1" y="-1578.1" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="5182.49,-1569.9 5405.71,-1569.9 "/>
-<text text-anchor="start" x="5190.49" y="-1553.3" font-family="Times,serif" font-size="14.00">order: RequestOrder</text>
-<text text-anchor="start" x="5190.49" y="-1536.5" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
-<text text-anchor="start" x="5190.49" y="-1519.7" font-family="Times,serif" font-size="14.00">sign: bytes</text>
-</g>
-<!-- 51&#45;&gt;61 -->
-<g id="edge71" class="edge">
-<title>51&#45;&gt;61</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5247.01,-1289.8C5257.69,-1365.61 5270,-1446.45 5279.49,-1501.5"/>
-<polygon fill="black" stroke="black" points="5276.06,-1502.23 5281.23,-1511.48 5282.96,-1501.02 5276.06,-1502.23"/>
+<!-- 51 -->
+<g id="node20" class="node">
+<title>51</title>
+<polygon fill="#f2f2f2" stroke="black" points="728,-1967.7 728,-2067.7 951.22,-2067.7 951.22,-1967.7 728,-1967.7"/>
+<text text-anchor="middle" x="839.61" y="-2051.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Enum&gt;&gt;</text>
+<text text-anchor="middle" x="839.61" y="-2034.3" font-family="Times,serif" font-size="14.00">OrderOperationEnum</text>
+<text text-anchor="middle" x="839.61" y="-2017.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="728,-2009.3 951.22,-2009.3 "/>
+<text text-anchor="start" x="736" y="-1992.7" font-family="Times,serif" font-size="14.00">SIGN: 0</text>
+<text text-anchor="start" x="736" y="-1975.9" font-family="Times,serif" font-size="14.00">CLOSE: 1</text>
+</g>
+<!-- 51&#45;&gt;50 -->
+<g id="edge47" class="edge">
+<title>51&#45;&gt;50</title>
+<path fill="none" stroke="black" d="M838.19,-1967.22C834.69,-1830.14 828.05,-1447.58 858.61,-1326.2 860.67,-1318.03 863.03,-1309.82 865.65,-1301.61"/>
+<polygon fill="black" stroke="black" points="865.73,-1301.4 863.83,-1294.44 869.53,-1290.02 871.42,-1296.98 865.73,-1301.4"/>
 </g>
-<!-- 52 -->
-<g id="node22" class="node">
-<title>52</title>
-<polygon fill="#f2f2f2" stroke="black" points="5042.49,-1967.7 5042.49,-2067.7 5265.71,-2067.7 5265.71,-1967.7 5042.49,-1967.7"/>
-<text text-anchor="middle" x="5154.1" y="-2051.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Enum&gt;&gt;</text>
-<text text-anchor="middle" x="5154.1" y="-2034.3" font-family="Times,serif" font-size="14.00">OrderOperationEnum</text>
-<text text-anchor="middle" x="5154.1" y="-2017.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="5042.49,-2009.3 5265.71,-2009.3 "/>
-<text text-anchor="start" x="5050.49" y="-1992.7" font-family="Times,serif" font-size="14.00">SIGN: 0</text>
-<text text-anchor="start" x="5050.49" y="-1975.9" font-family="Times,serif" font-size="14.00">CLOSE: 1</text>
-</g>
-<!-- 52&#45;&gt;51 -->
-<g id="edge53" class="edge">
-<title>52&#45;&gt;51</title>
-<path fill="none" stroke="black" d="M5152.41,-1967.5C5149.17,-1854.01 5144.72,-1565.27 5173.1,-1326.2 5174.05,-1318.22 5175.13,-1310.11 5176.33,-1301.94"/>
-<polygon fill="black" stroke="black" points="5176.35,-1301.79 5173.3,-1295.26 5178.15,-1289.93 5181.2,-1296.46 5176.35,-1301.79"/>
+<!-- 52&#45;&gt;50 -->
+<g id="edge48" class="edge">
+<title>52&#45;&gt;50</title>
+<path fill="none" stroke="black" d="M1195.59,-1502.92C1173.05,-1454.07 1139.39,-1385.93 1109.61,-1326.2 1105.46,-1317.89 1101.23,-1309.41 1096.95,-1300.86"/>
+<polygon fill="black" stroke="black" points="1096.88,-1300.71 1090.61,-1297.13 1091.5,-1289.98 1097.77,-1293.55 1096.88,-1300.71"/>
 </g>
-<!-- 53&#45;&gt;51 -->
-<g id="edge54" class="edge">
-<title>53&#45;&gt;51</title>
-<path fill="none" stroke="black" d="M5763.01,-1502.93C5745.79,-1450.08 5713.15,-1376.67 5665.1,-1326.2 5605.78,-1263.89 5526.72,-1213.49 5451.92,-1175.21"/>
-<polygon fill="black" stroke="black" points="5451.63,-1175.06 5444.47,-1175.93 5440.91,-1169.65 5448.07,-1168.79 5451.63,-1175.06"/>
+<!-- 53&#45;&gt;50 -->
+<g id="edge49" class="edge">
+<title>53&#45;&gt;50</title>
+<path fill="none" stroke="black" d="M1382.52,-1908.8C1395.42,-1740.03 1404.97,-1422.87 1350.61,-1326.2 1317.63,-1267.56 1263.72,-1220.57 1207.08,-1184.23"/>
+<polygon fill="black" stroke="black" points="1207.01,-1184.18 1199.8,-1184.37 1196.85,-1177.79 1204.06,-1177.6 1207.01,-1184.18"/>
 </g>
-<!-- 54&#45;&gt;51 -->
-<g id="edge55" class="edge">
-<title>54&#45;&gt;51</title>
-<path fill="none" stroke="black" d="M6120.86,-1908.68C6080.16,-1725.31 5989.98,-1368.79 5949.1,-1326.2 5819.76,-1191.44 5612.69,-1132.12 5452.88,-1106.02"/>
-<polygon fill="black" stroke="black" points="5452.83,-1106.01 5446.27,-1109.01 5440.98,-1104.12 5447.53,-1101.11 5452.83,-1106.01"/>
+<!-- 54&#45;&gt;50 -->
+<g id="edge50" class="edge">
+<title>54&#45;&gt;50</title>
+<path fill="none" stroke="black" d="M1764.69,-1908.73C1782.13,-1760.33 1784.8,-1492.8 1648.61,-1326.2 1541.6,-1195.3 1356.97,-1135.59 1208.71,-1108.35"/>
+<polygon fill="black" stroke="black" points="1208.56,-1108.32 1201.95,-1111.2 1196.75,-1106.2 1203.36,-1103.32 1208.56,-1108.32"/>
 </g>
-<!-- 55&#45;&gt;51 -->
-<g id="edge56" class="edge">
-<title>55&#45;&gt;51</title>
-<path fill="none" stroke="black" d="M4671.24,-1908.85C4644.91,-1738.96 4599.6,-1418.81 4661.1,-1326.2 4735.8,-1213.71 4874.46,-1153.68 4995.49,-1121.69"/>
-<polygon fill="black" stroke="black" points="4995.53,-1121.69 5000.34,-1116.31 5007.15,-1118.69 5002.34,-1124.06 4995.53,-1121.69"/>
+<!-- 55&#45;&gt;50 -->
+<g id="edge51" class="edge">
+<title>55&#45;&gt;50</title>
+<path fill="none" stroke="black" d="M137.04,-1891.93C170.03,-1716.23 231.6,-1408.16 307.61,-1326.2 422.37,-1202.45 604.7,-1142.29 750.52,-1113.06"/>
+<polygon fill="black" stroke="black" points="750.95,-1112.98 756.07,-1107.9 762.73,-1110.67 757.61,-1115.75 750.95,-1112.98"/>
 </g>
-<!-- 56&#45;&gt;51 -->
-<g id="edge57" class="edge">
-<title>56&#45;&gt;51</title>
-<path fill="none" stroke="black" d="M4486.05,-1891.88C4492.86,-1866.01 4499.74,-1838.93 4506.1,-1813.6 4560.43,-1597.23 4479.44,-1494.31 4626.1,-1326.2 4720.32,-1218.2 4869.52,-1158.16 4995.34,-1125.06"/>
-<polygon fill="black" stroke="black" points="4995.43,-1125.04 5000.24,-1119.67 5007.05,-1122.04 5002.24,-1127.41 4995.43,-1125.04"/>
+<!-- 56&#45;&gt;50 -->
+<g id="edge52" class="edge">
+<title>56&#45;&gt;50</title>
+<path fill="none" stroke="black" d="M333.74,-1849.81C312.95,-1672.85 290.05,-1407.81 346.61,-1326.2 437.46,-1195.12 609.07,-1135.31 750.72,-1108.08"/>
+<polygon fill="black" stroke="black" points="750.8,-1108.07 755.97,-1103.03 762.6,-1105.86 757.44,-1110.9 750.8,-1108.07"/>
+</g>
+<!-- 57&#45;&gt;50 -->
+<g id="edge53" class="edge">
+<title>57&#45;&gt;50</title>
+<path fill="none" stroke="black" d="M984.17,-1511.48C985.81,-1459.32 986.53,-1379 986.33,-1302.11"/>
+<polygon fill="black" stroke="black" points="986.33,-1301.8 982.31,-1295.82 986.29,-1289.8 990.31,-1295.79 986.33,-1301.8"/>
 </g>
 <!-- 57&#45;&gt;51 -->
-<g id="edge58" class="edge">
+<g id="edge67" class="edge">
 <title>57&#45;&gt;51</title>
-<path fill="none" stroke="black" d="M5927.2,-1849.99C5947.82,-1672.84 5963.49,-1407.3 5906.1,-1326.2 5804.46,-1182.56 5608.92,-1124.2 5453.17,-1100.71"/>
-<polygon fill="black" stroke="black" points="5452.95,-1100.68 5446.44,-1103.77 5441.08,-1098.95 5447.59,-1095.85 5452.95,-1100.68"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M961.45,-1628.72C934.7,-1713.91 884.97,-1872.26 858.06,-1957.96"/>
+<polygon fill="black" stroke="black" points="854.7,-1956.95 855.05,-1967.54 861.38,-1959.05 854.7,-1956.95"/>
+</g>
+<!-- 57&#45;&gt;53 -->
+<g id="edge66" class="edge">
+<title>57&#45;&gt;53</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M999.28,-1628.49C1019.02,-1680.63 1053.17,-1757.62 1099.61,-1813.6 1141.56,-1864.17 1198.49,-1909.37 1249.26,-1944.22"/>
+<polygon fill="black" stroke="black" points="1247.44,-1947.21 1257.68,-1949.94 1251.38,-1941.42 1247.44,-1947.21"/>
+</g>
+<!-- 58&#45;&gt;50 -->
+<g id="edge54" class="edge">
+<title>58&#45;&gt;50</title>
+<path fill="none" stroke="black" d="M1506.29,-1511.28C1488.3,-1458.22 1452.68,-1379.83 1401.61,-1326.2 1347.01,-1268.87 1275.75,-1220.84 1207.37,-1183.15"/>
+<polygon fill="black" stroke="black" points="1206.96,-1182.92 1199.78,-1183.57 1196.42,-1177.18 1203.6,-1176.54 1206.96,-1182.92"/>
 </g>
 <!-- 58&#45;&gt;51 -->
-<g id="edge59" class="edge">
+<g id="edge69" class="edge">
 <title>58&#45;&gt;51</title>
-<path fill="none" stroke="black" d="M5517.83,-1511.16C5497.49,-1460.79 5462.35,-1386.54 5424.1,-1326.2 5418.55,-1317.44 5412.74,-1308.63 5406.74,-1299.82"/>
-<polygon fill="black" stroke="black" points="5406.7,-1299.75 5400,-1297.08 5399.89,-1289.87 5406.59,-1292.54 5406.7,-1299.75"/>
-</g>
-<!-- 58&#45;&gt;52 -->
-<g id="edge73" class="edge">
-<title>58&#45;&gt;52</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5515.21,-1628.31C5495.32,-1680.33 5461.08,-1757.24 5415.1,-1813.6 5366.95,-1872.61 5298.62,-1925 5243.95,-1961.79"/>
-<polygon fill="black" stroke="black" points="5241.68,-1959.09 5235.3,-1967.55 5245.56,-1964.92 5241.68,-1959.09"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1489.38,-1628.3C1459.06,-1682.72 1406.95,-1763.41 1341.61,-1813.6 1306.46,-1840.6 1289.79,-1833.22 1248.61,-1849.6 1151.5,-1888.23 1041.91,-1933.07 960.62,-1966.57"/>
+<polygon fill="black" stroke="black" points="959.26,-1963.35 951.35,-1970.39 961.93,-1969.82 959.26,-1963.35"/>
 </g>
 <!-- 58&#45;&gt;54 -->
-<g id="edge72" class="edge">
+<g id="edge68" class="edge">
 <title>58&#45;&gt;54</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5546.62,-1628.32C5561.34,-1685.41 5592.75,-1770.5 5655.1,-1813.6 5789.56,-1906.54 5879.5,-1767.96 6021.1,-1849.6 6042.95,-1862.2 6061.88,-1880.57 6077.84,-1900.56"/>
-<polygon fill="black" stroke="black" points="6075.15,-1902.81 6084.03,-1908.59 6080.7,-1898.54 6075.15,-1902.81"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1547.79,-1628.72C1582.25,-1696.99 1640.41,-1812.24 1684.42,-1899.44"/>
+<polygon fill="black" stroke="black" points="1681.41,-1901.23 1689.04,-1908.58 1687.66,-1898.08 1681.41,-1901.23"/>
+</g>
+<!-- 59&#45;&gt;50 -->
+<g id="edge55" class="edge">
+<title>59&#45;&gt;50</title>
+<path fill="none" stroke="black" d="M483.45,-1511.41C504.22,-1458.45 537.91,-1380.12 587.61,-1326.2 634.14,-1275.72 693.67,-1232.33 752.22,-1196.85"/>
+<polygon fill="black" stroke="black" points="752.46,-1196.71 755.55,-1190.2 762.75,-1190.55 759.66,-1197.06 752.46,-1196.71"/>
 </g>
 <!-- 59&#45;&gt;51 -->
-<g id="edge60" class="edge">
+<g id="edge71" class="edge">
 <title>59&#45;&gt;51</title>
-<path fill="none" stroke="black" d="M5043.6,-1511.48C5068,-1459.1 5103.81,-1378.34 5137.13,-1301.16"/>
-<polygon fill="black" stroke="black" points="5137.27,-1300.82 5135.97,-1293.73 5142.02,-1289.8 5143.32,-1296.9 5137.27,-1300.82"/>
-</g>
-<!-- 59&#45;&gt;52 -->
-<g id="edge75" class="edge">
-<title>59&#45;&gt;52</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5032.26,-1628.72C5059.01,-1713.91 5108.74,-1872.26 5135.65,-1957.96"/>
-<polygon fill="black" stroke="black" points="5132.33,-1959.05 5138.66,-1967.54 5139,-1956.95 5132.33,-1959.05"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M478.49,-1628.31C498.39,-1680.33 532.63,-1757.24 578.61,-1813.6 626.76,-1872.61 695.09,-1925 749.76,-1961.79"/>
+<polygon fill="black" stroke="black" points="748.14,-1964.92 758.41,-1967.55 752.03,-1959.09 748.14,-1964.92"/>
 </g>
 <!-- 59&#45;&gt;55 -->
-<g id="edge74" class="edge">
+<g id="edge70" class="edge">
 <title>59&#45;&gt;55</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4992.19,-1628.39C4971.2,-1679.6 4936.51,-1755.23 4894.1,-1813.6 4868.49,-1848.85 4836.5,-1883.42 4805.35,-1913.77"/>
-<polygon fill="black" stroke="black" points="4802.64,-1911.52 4797.87,-1920.98 4807.5,-1916.55 4802.64,-1911.52"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M409.96,-1628.53C363.27,-1684.32 291.24,-1771.67 231.61,-1849.6 223.14,-1860.66 214.47,-1872.23 205.86,-1883.9"/>
+<polygon fill="black" stroke="black" points="203.01,-1881.86 199.9,-1891.98 208.65,-1886.01 203.01,-1881.86"/>
+</g>
+<!-- 60&#45;&gt;50 -->
+<g id="edge56" class="edge">
+<title>60&#45;&gt;50</title>
+<path fill="none" stroke="black" d="M734.86,-1511.23C761.35,-1461.55 798.74,-1388.27 834.61,-1326.2 839.51,-1317.73 844.56,-1309.13 849.72,-1300.48"/>
+<polygon fill="black" stroke="black" points="849.89,-1300.19 849.55,-1292.99 856.06,-1289.9 856.41,-1297.11 849.89,-1300.19"/>
 </g>
 <!-- 60&#45;&gt;51 -->
-<g id="edge61" class="edge">
+<g id="edge73" class="edge">
 <title>60&#45;&gt;51</title>
-<path fill="none" stroke="black" d="M4799.47,-1511.38C4821.05,-1459.12 4855.13,-1381.89 4902.1,-1326.2 4929.84,-1293.31 4962.98,-1262.51 4997.29,-1234.65"/>
-<polygon fill="black" stroke="black" points="4997.63,-1234.38 4999.81,-1227.51 5006.99,-1226.87 5004.81,-1233.75 4997.63,-1234.38"/>
-</g>
-<!-- 60&#45;&gt;52 -->
-<g id="edge77" class="edge">
-<title>60&#45;&gt;52</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4792.99,-1628.31C4812.88,-1680.33 4847.12,-1757.24 4893.1,-1813.6 4941.25,-1872.61 5009.58,-1925 5064.25,-1961.79"/>
-<polygon fill="black" stroke="black" points="5062.64,-1964.92 5072.9,-1967.55 5066.52,-1959.09 5062.64,-1964.92"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M717.77,-1628.72C744.52,-1713.91 794.25,-1872.26 821.16,-1957.96"/>
+<polygon fill="black" stroke="black" points="817.83,-1959.05 824.17,-1967.54 824.51,-1956.95 817.83,-1959.05"/>
 </g>
 <!-- 60&#45;&gt;56 -->
-<g id="edge76" class="edge">
+<g id="edge72" class="edge">
 <title>60&#45;&gt;56</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4729.77,-1628.32C4687.48,-1684.51 4621.45,-1772.63 4565.1,-1849.6 4557.04,-1860.62 4548.7,-1872.07 4540.37,-1883.58"/>
-<polygon fill="black" stroke="black" points="4537.32,-1881.81 4534.3,-1891.96 4542.99,-1885.91 4537.32,-1881.81"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M678.5,-1628.34C657.95,-1679.85 623.42,-1755.98 579.61,-1813.6 549.06,-1853.79 509.73,-1892.24 472.41,-1924.67"/>
+<polygon fill="black" stroke="black" points="469.78,-1922.32 464.48,-1931.5 474.35,-1927.62 469.78,-1922.32"/>
 </g>
-<!-- 61&#45;&gt;51 -->
-<g id="edge62" class="edge">
-<title>61&#45;&gt;51</title>
-<path fill="none" stroke="black" d="M5290.34,-1511.48C5284.43,-1459.32 5273.52,-1379 5262.18,-1302.11"/>
-<polygon fill="black" stroke="black" points="5262.12,-1301.68 5257.28,-1296.33 5260.36,-1289.8 5265.2,-1295.15 5262.12,-1301.68"/>
-</g>
-<!-- 61&#45;&gt;52 -->
-<g id="edge79" class="edge">
-<title>61&#45;&gt;52</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5275.94,-1628.72C5249.19,-1713.91 5199.46,-1872.26 5172.55,-1957.96"/>
-<polygon fill="black" stroke="black" points="5169.2,-1956.95 5169.54,-1967.54 5175.87,-1959.05 5169.2,-1956.95"/>
+<!-- 61&#45;&gt;62 -->
+<g id="edge75" class="edge">
+<title>61&#45;&gt;62</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4719.69,-1155.53C4718.54,-1198.76 4717.93,-1257.12 4717.86,-1316.35"/>
+<polygon fill="black" stroke="black" points="4714.36,-1316.64 4717.86,-1326.64 4721.36,-1316.64 4714.36,-1316.64"/>
 </g>
-<!-- 61&#45;&gt;57 -->
+<!-- 62&#45;&gt;24 -->
 <g id="edge78" class="edge">
-<title>61&#45;&gt;57</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5309.75,-1628.54C5327.14,-1682.75 5360.12,-1762.94 5414.1,-1813.6 5516.58,-1909.79 5671.2,-1963.69 5778.4,-1991.4"/>
-<polygon fill="black" stroke="black" points="5777.75,-1994.85 5788.3,-1993.92 5779.47,-1988.07 5777.75,-1994.85"/>
+<title>62&#45;&gt;24</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4651.73,-1813.37C4635.55,-1867.17 4619.84,-1919.44 4608.4,-1957.51"/>
+<polygon fill="black" stroke="black" points="4604.96,-1956.78 4605.44,-1967.37 4611.67,-1958.8 4604.96,-1956.78"/>
+</g>
+<!-- 62&#45;&gt;36 -->
+<g id="edge77" class="edge">
+<title>62&#45;&gt;36</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4985.71,-1746.15C5024.03,-1769.76 5063.45,-1792.93 5101.61,-1813.6 5228.05,-1882.07 5382.11,-1947.41 5474.34,-1984.71"/>
+<polygon fill="black" stroke="black" points="5473.04,-1987.96 5483.62,-1988.45 5475.66,-1981.47 5473.04,-1987.96"/>
+</g>
+<!-- 62&#45;&gt;61 -->
+<g id="edge74" class="edge">
+<title>62&#45;&gt;61</title>
+<path fill="none" stroke="black" d="M4731.36,-1326.64C4731.36,-1269.31 4730.85,-1212.03 4729.83,-1167.69"/>
+<polygon fill="black" stroke="black" points="4729.83,-1167.53 4725.68,-1161.63 4729.53,-1155.53 4733.68,-1161.43 4729.83,-1167.53"/>
+</g>
+<!-- 63 -->
+<g id="node32" class="node">
+<title>63</title>
+<polygon fill="#f2f2f2" stroke="black" points="4743.88,-1967.7 4743.88,-2067.7 4973.33,-2067.7 4973.33,-1967.7 4743.88,-1967.7"/>
+<text text-anchor="middle" x="4858.61" y="-2051.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
+<text text-anchor="middle" x="4858.61" y="-2034.3" font-family="Times,serif" font-size="14.00">IRegistry</text>
+<text text-anchor="middle" x="4858.61" y="-2017.5" font-family="Times,serif" font-size="14.00">contracts/registries/IRegistry.sol</text>
+<polyline fill="none" stroke="black" points="4743.88,-2009.3 4973.33,-2009.3 "/>
+<text text-anchor="start" x="4751.88" y="-1992.7" font-family="Times,serif" font-size="14.00">External:</text>
+<text text-anchor="start" x="4751.88" y="-1975.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;isRegistered(_entry: address): bool</text>
 </g>
 <!-- 62&#45;&gt;63 -->
-<g id="edge81" class="edge">
+<g id="edge76" class="edge">
 <title>62&#45;&gt;63</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2319.18,-1155.53C2318.03,-1198.76 2317.42,-1257.12 2317.36,-1316.35"/>
-<polygon fill="black" stroke="black" points="2313.86,-1316.64 2317.35,-1326.64 2320.86,-1316.64 2313.86,-1316.64"/>
-</g>
-<!-- 63&#45;&gt;27 -->
-<g id="edge84" class="edge">
-<title>63&#45;&gt;27</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2251.22,-1813.37C2235.05,-1867.17 2219.33,-1919.44 2207.89,-1957.51"/>
-<polygon fill="black" stroke="black" points="2204.46,-1956.78 2204.93,-1967.37 2211.16,-1958.8 2204.46,-1956.78"/>
-</g>
-<!-- 63&#45;&gt;37 -->
-<g id="edge83" class="edge">
-<title>63&#45;&gt;37</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2062.92,-1652.67C1743.45,-1752.68 1218.27,-1917.09 1000.03,-1985.41"/>
-<polygon fill="black" stroke="black" points="998.69,-1982.17 990.19,-1988.5 1000.78,-1988.85 998.69,-1982.17"/>
-</g>
-<!-- 63&#45;&gt;62 -->
-<g id="edge80" class="edge">
-<title>63&#45;&gt;62</title>
-<path fill="none" stroke="black" d="M2330.85,-1326.64C2330.85,-1269.31 2330.34,-1212.03 2329.32,-1167.69"/>
-<polygon fill="black" stroke="black" points="2329.32,-1167.53 2325.17,-1161.63 2329.02,-1155.53 2333.17,-1161.43 2329.32,-1167.53"/>
-</g>
-<!-- 64 -->
-<g id="node34" class="node">
-<title>64</title>
-<polygon fill="#f2f2f2" stroke="black" points="2343.37,-1967.7 2343.37,-2067.7 2572.83,-2067.7 2572.83,-1967.7 2343.37,-1967.7"/>
-<text text-anchor="middle" x="2458.1" y="-2051.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
-<text text-anchor="middle" x="2458.1" y="-2034.3" font-family="Times,serif" font-size="14.00">IRegistry</text>
-<text text-anchor="middle" x="2458.1" y="-2017.5" font-family="Times,serif" font-size="14.00">contracts/registries/IRegistry.sol</text>
-<polyline fill="none" stroke="black" points="2343.37,-2009.3 2572.83,-2009.3 "/>
-<text text-anchor="start" x="2351.37" y="-1992.7" font-family="Times,serif" font-size="14.00">External:</text>
-<text text-anchor="start" x="2351.37" y="-1975.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;isRegistered(_entry: address): bool</text>
-</g>
-<!-- 63&#45;&gt;64 -->
-<g id="edge82" class="edge">
-<title>63&#45;&gt;64</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2396.98,-1813.37C2413.15,-1867.17 2428.87,-1919.44 2440.31,-1957.51"/>
-<polygon fill="black" stroke="black" points="2437.04,-1958.8 2443.27,-1967.37 2443.74,-1956.78 2437.04,-1958.8"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4797.49,-1813.37C4813.66,-1867.17 4829.37,-1919.44 4840.82,-1957.51"/>
+<polygon fill="black" stroke="black" points="4837.55,-1958.8 4843.78,-1967.37 4844.25,-1956.78 4837.55,-1958.8"/>
 </g>
 </g>
 </svg>
diff --git a/docs/uml/class-uml-dir-libs.svg b/docs/uml/class-uml-dir-libs.svg
index 0875f7d38..8b2a0b1e1 100644
--- a/docs/uml/class-uml-dir-libs.svg
+++ b/docs/uml/class-uml-dir-libs.svg
@@ -4,725 +4,791 @@
 <!-- Generated by graphviz version 5.0.0 (20220707.1540)
  -->
 <!-- Title: UmlClassDiagram Pages: 1 -->
-<svg width="4549pt" height="1315pt"
- viewBox="0.00 0.00 4548.78 1315.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 1311)">
+<svg width="5898pt" height="1410pt"
+ viewBox="0.00 0.00 5897.69 1410.40" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 1406.4)">
 <title>UmlClassDiagram</title>
-<polygon fill="white" stroke="transparent" points="-4,4 -4,-1311 4544.78,-1311 4544.78,4 -4,4"/>
+<polygon fill="white" stroke="transparent" points="-4,4 -4,-1406.4 5893.69,-1406.4 5893.69,4 -4,4"/>
 <!-- 0 -->
 <g id="node1" class="node">
 <title>0</title>
-<polygon fill="#f2f2f2" stroke="black" points="1224,-1109.7 1224,-1168.1 1436.33,-1168.1 1436.33,-1109.7 1224,-1109.7"/>
-<text text-anchor="middle" x="1330.17" y="-1151.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
-<text text-anchor="middle" x="1330.17" y="-1134.7" font-family="Times,serif" font-size="14.00">IexecLibCore_v5</text>
-<text text-anchor="middle" x="1330.17" y="-1117.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polygon fill="#f2f2f2" stroke="black" points="0,-84.5 0,-326.9 1896.16,-326.9 1896.16,-84.5 0,-84.5"/>
+<text text-anchor="middle" x="948.08" y="-310.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
+<text text-anchor="middle" x="948.08" y="-293.5" font-family="Times,serif" font-size="14.00">CommonLib</text>
+<text text-anchor="middle" x="948.08" y="-276.7" font-family="Times,serif" font-size="14.00">contracts/libs/CommonLib.sol</text>
+<polyline fill="none" stroke="black" points="0,-268.5 1896.16,-268.5 "/>
+<text text-anchor="start" x="8" y="-251.9" font-family="Times,serif" font-size="14.00">Private:</text>
+<text text-anchor="start" x="8" y="-235.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;GROUPMEMBER_PURPOSE: uint256</text>
+<polyline fill="none" stroke="black" points="0,-226.9 1896.16,-226.9 "/>
+<text text-anchor="start" x="8" y="-210.3" font-family="Times,serif" font-size="14.00">Internal:</text>
+<text text-anchor="start" x="8" y="-193.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;toTypedDataHash(structHash: bytes32): bytes32</text>
+<text text-anchor="start" x="8" y="-176.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;verifySignatureOfEthSignedMessage(account: address, message: bytes, signature: bytes): bool</text>
+<text text-anchor="start" x="8" y="-159.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;verifySignature(account: address, messageHash: bytes32, signature: bytes): bool</text>
+<text text-anchor="start" x="8" y="-143.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;verifyPresignature(account: address, messageHash: bytes32): bool</text>
+<text text-anchor="start" x="8" y="-126.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;verifySignatureOrPresignature(account: address, messageHash: bytes32, signature: bytes): bool</text>
+<text text-anchor="start" x="8" y="-109.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;isAccountAuthorizedByRestriction(restriction: address, account: address): bool</text>
+<text text-anchor="start" x="8" y="-92.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;computeDealVolume(appOrderVolume: uint256, appOrderTypedDataHash: bytes32, hasDataset: bool, datasetOrderVolume: uint256, datasetOrderTypedDataHash: bytes32, workerpoolOrderVolume: uint256, workerpoolOrderTypedDataHash: bytes32, requestOrderVolume: uint256, requestOrderTypedDataHash: bytes32): uint256</text>
+</g>
+<!-- 27 -->
+<g id="node28" class="node">
+<title>27</title>
+<polygon fill="#f2f2f2" stroke="black" points="1611.63,-544.7 1611.63,-686.3 1876.52,-686.3 1876.52,-544.7 1611.63,-544.7"/>
+<text text-anchor="middle" x="1744.08" y="-669.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
+<text text-anchor="middle" x="1744.08" y="-652.9" font-family="Times,serif" font-size="14.00">PocoStorageLib</text>
+<text text-anchor="middle" x="1744.08" y="-636.1" font-family="Times,serif" font-size="14.00">contracts/libs/PocoStorageLib.sol</text>
+<polyline fill="none" stroke="black" points="1611.63,-627.9 1876.52,-627.9 "/>
+<text text-anchor="start" x="1619.63" y="-611.3" font-family="Times,serif" font-size="14.00">Private:</text>
+<text text-anchor="start" x="1619.63" y="-594.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;POCO_STORAGE_LOCATION: bytes32</text>
+<polyline fill="none" stroke="black" points="1611.63,-586.3 1876.52,-586.3 "/>
+<text text-anchor="start" x="1619.63" y="-569.7" font-family="Times,serif" font-size="14.00">Internal:</text>
+<text text-anchor="start" x="1619.63" y="-552.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;getPocoStorage(): ($: PocoStorage)</text>
+</g>
+<!-- 0&#45;&gt;27 -->
+<g id="edge1" class="edge">
+<title>0&#45;&gt;27</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1182.87,-326.99C1319.06,-396.76 1486.1,-482.34 1602.37,-541.9"/>
+<polygon fill="black" stroke="black" points="1600.85,-545.06 1611.35,-546.5 1604.05,-538.83 1600.85,-545.06"/>
+</g>
+<!-- 28 -->
+<g id="node29" class="node">
+<title>28</title>
+<polygon fill="#f2f2f2" stroke="black" points="1483.11,-820.1 1483.11,-1306.5 2005.05,-1306.5 2005.05,-820.1 1483.11,-820.1"/>
+<text text-anchor="middle" x="1744.08" y="-1289.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="1744.08" y="-1273.1" font-family="Times,serif" font-size="14.00">PocoStorage</text>
+<text text-anchor="middle" x="1744.08" y="-1256.3" font-family="Times,serif" font-size="14.00">contracts/libs/PocoStorageLib.sol</text>
+<polyline fill="none" stroke="black" points="1483.11,-1248.1 2005.05,-1248.1 "/>
+<text text-anchor="start" x="1491.11" y="-1231.5" font-family="Times,serif" font-size="14.00">m_appregistry: IRegistry</text>
+<text text-anchor="start" x="1491.11" y="-1214.7" font-family="Times,serif" font-size="14.00">m_datasetregistry: IRegistry</text>
+<text text-anchor="start" x="1491.11" y="-1197.9" font-family="Times,serif" font-size="14.00">m_workerpoolregistry: IRegistry</text>
+<text text-anchor="start" x="1491.11" y="-1181.1" font-family="Times,serif" font-size="14.00">m_baseToken: IERC20</text>
+<text text-anchor="start" x="1491.11" y="-1164.3" font-family="Times,serif" font-size="14.00">m_name: string</text>
+<text text-anchor="start" x="1491.11" y="-1147.5" font-family="Times,serif" font-size="14.00">m_symbol: string</text>
+<text text-anchor="start" x="1491.11" y="-1130.7" font-family="Times,serif" font-size="14.00">m_decimals: uint8</text>
+<text text-anchor="start" x="1491.11" y="-1113.9" font-family="Times,serif" font-size="14.00">m_totalSupply: uint256</text>
+<text text-anchor="start" x="1491.11" y="-1097.1" font-family="Times,serif" font-size="14.00">m_balances: mapping(address=&gt;uint256)</text>
+<text text-anchor="start" x="1491.11" y="-1080.3" font-family="Times,serif" font-size="14.00">m_frozens: mapping(address=&gt;uint256)</text>
+<text text-anchor="start" x="1491.11" y="-1063.5" font-family="Times,serif" font-size="14.00">m_allowances: mapping(address=&gt;mapping(address=&gt;uint256))</text>
+<text text-anchor="start" x="1491.11" y="-1046.7" font-family="Times,serif" font-size="14.00">m_eip712DomainSeparator: bytes32</text>
+<text text-anchor="start" x="1491.11" y="-1029.9" font-family="Times,serif" font-size="14.00">m_presigned: mapping(bytes32=&gt;address)</text>
+<text text-anchor="start" x="1491.11" y="-1013.1" font-family="Times,serif" font-size="14.00">m_consumed: mapping(bytes32=&gt;uint256)</text>
+<text text-anchor="start" x="1491.11" y="-996.3" font-family="Times,serif" font-size="14.00">m_deals: mapping(bytes32=&gt;IexecLibCore_v5.Deal)</text>
+<text text-anchor="start" x="1491.11" y="-979.5" font-family="Times,serif" font-size="14.00">m_tasks: mapping(bytes32=&gt;IexecLibCore_v5.Task)</text>
+<text text-anchor="start" x="1491.11" y="-962.7" font-family="Times,serif" font-size="14.00">m_consensus: mapping(bytes32=&gt;IexecLibCore_v5.Consensus)</text>
+<text text-anchor="start" x="1491.11" y="-945.9" font-family="Times,serif" font-size="14.00">m_contributions: mapping(bytes32=&gt;mapping(address=&gt;IexecLibCore_v5.Contribution))</text>
+<text text-anchor="start" x="1491.11" y="-929.1" font-family="Times,serif" font-size="14.00">m_workerScores: mapping(address=&gt;uint256)</text>
+<text text-anchor="start" x="1491.11" y="-912.3" font-family="Times,serif" font-size="14.00">m_teebroker: address</text>
+<text text-anchor="start" x="1491.11" y="-895.5" font-family="Times,serif" font-size="14.00">m_callbackgas: uint256</text>
+<text text-anchor="start" x="1491.11" y="-878.7" font-family="Times,serif" font-size="14.00">m_categories: IexecLibCore_v5.Category[]</text>
+<text text-anchor="start" x="1491.11" y="-861.9" font-family="Times,serif" font-size="14.00">m_v3_iexecHub: IexecHubV3Interface</text>
+<text text-anchor="start" x="1491.11" y="-845.1" font-family="Times,serif" font-size="14.00">m_v3_scoreImported: mapping(address=&gt;bool)</text>
+<text text-anchor="start" x="1491.11" y="-828.3" font-family="Times,serif" font-size="14.00">m_dealsBoost: mapping(bytes32=&gt;IexecLibCore_v5.DealBoost)</text>
+</g>
+<!-- 0&#45;&gt;28 -->
+<g id="edge2" class="edge">
+<title>0&#45;&gt;28</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1060.02,-327.02C1176.67,-452.41 1362.85,-652.53 1511.55,-812.36"/>
+<polygon fill="black" stroke="black" points="1509.22,-815 1518.6,-819.94 1514.35,-810.23 1509.22,-815"/>
 </g>
 <!-- 1 -->
 <g id="node2" class="node">
 <title>1</title>
-<polygon fill="#f2f2f2" stroke="black" points="0,-641.1 0,-741.1 212.33,-741.1 212.33,-641.1 0,-641.1"/>
-<text text-anchor="middle" x="106.17" y="-724.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="106.17" y="-707.7" font-family="Times,serif" font-size="14.00">Account</text>
-<text text-anchor="middle" x="106.17" y="-690.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
-<polyline fill="none" stroke="black" points="0,-682.7 212.33,-682.7 "/>
-<text text-anchor="start" x="8" y="-666.1" font-family="Times,serif" font-size="14.00">stake: uint256</text>
-<text text-anchor="start" x="8" y="-649.3" font-family="Times,serif" font-size="14.00">locked: uint256</text>
-</g>
-<!-- 1&#45;&gt;0 -->
+<polygon fill="#f2f2f2" stroke="black" points="1914.45,-63.3 1914.45,-348.1 2319.71,-348.1 2319.71,-63.3 1914.45,-63.3"/>
+<text text-anchor="middle" x="2117.08" y="-331.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
+<text text-anchor="middle" x="2117.08" y="-314.7" font-family="Times,serif" font-size="14.00">EscrowLib</text>
+<text text-anchor="middle" x="2117.08" y="-297.9" font-family="Times,serif" font-size="14.00">contracts/libs/EscrowLib.sol</text>
+<polyline fill="none" stroke="black" points="1914.45,-289.7 2319.71,-289.7 "/>
+<text text-anchor="start" x="1922.45" y="-273.1" font-family="Times,serif" font-size="14.00">Internal:</text>
+<text text-anchor="start" x="1922.45" y="-256.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;lock(account: address, value: uint256)</text>
+<text text-anchor="start" x="1922.45" y="-239.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;unlock(account: address, value: uint256)</text>
+<text text-anchor="start" x="1922.45" y="-222.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;reward(account: address, value: uint256, ref: bytes32)</text>
+<text text-anchor="start" x="1922.45" y="-205.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;seize(account: address, value: uint256, ref: bytes32)</text>
+<text text-anchor="start" x="1922.45" y="-189.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;rewardAndLock(account: address, value: uint256, ref: bytes32)</text>
+<text text-anchor="start" x="1922.45" y="-172.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;transfer(from: address, to: address, value: uint256)</text>
+<text text-anchor="start" x="1922.45" y="-155.5" font-family="Times,serif" font-size="14.00">Public:</text>
+<text text-anchor="start" x="1922.45" y="-138.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Transfer(from: address, to: address, value: uint256)</text>
+<text text-anchor="start" x="1922.45" y="-121.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Reward(owner: address, amount: uint256, ref: bytes32)</text>
+<text text-anchor="start" x="1922.45" y="-105.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Seize(owner: address, amount: uint256, ref: bytes32)</text>
+<text text-anchor="start" x="1922.45" y="-88.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Lock(owner: address, amount: uint256)</text>
+<text text-anchor="start" x="1922.45" y="-71.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Unlock(owner: address, amount: uint256)</text>
+</g>
+<!-- 1&#45;&gt;27 -->
 <g id="edge3" class="edge">
-<title>1&#45;&gt;0</title>
-<path fill="none" stroke="black" d="M115.57,-741.51C128.92,-797.48 159.03,-887.1 221.17,-934.8 375.46,-1053.24 958.59,-1110.19 1211.72,-1129.74"/>
-<polygon fill="black" stroke="black" points="1211.92,-1129.76 1218.21,-1126.23 1223.88,-1130.67 1217.6,-1134.2 1211.92,-1129.76"/>
+<title>1&#45;&gt;27</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1987.67,-348.18C1929.69,-411.57 1863.57,-483.86 1814.86,-537.12"/>
+<polygon fill="black" stroke="black" points="1812.27,-534.76 1808.1,-544.5 1817.43,-539.49 1812.27,-534.76"/>
+</g>
+<!-- 1&#45;&gt;28 -->
+<g id="edge4" class="edge">
+<title>1&#45;&gt;28</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2064.04,-348.31C2019.04,-465.98 1951.4,-637.21 1885.08,-783.6 1881.01,-792.58 1876.81,-801.7 1872.51,-810.88"/>
+<polygon fill="black" stroke="black" points="1869.27,-809.54 1868.18,-820.08 1875.6,-812.52 1869.27,-809.54"/>
 </g>
 <!-- 2 -->
 <g id="node3" class="node">
 <title>2</title>
-<polygon fill="#f2f2f2" stroke="black" points="230,-632.7 230,-749.5 442.33,-749.5 442.33,-632.7 230,-632.7"/>
-<text text-anchor="middle" x="336.17" y="-732.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="336.17" y="-716.1" font-family="Times,serif" font-size="14.00">Category</text>
-<text text-anchor="middle" x="336.17" y="-699.3" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
-<polyline fill="none" stroke="black" points="230,-691.1 442.33,-691.1 "/>
-<text text-anchor="start" x="238" y="-674.5" font-family="Times,serif" font-size="14.00">name: string</text>
-<text text-anchor="start" x="238" y="-657.7" font-family="Times,serif" font-size="14.00">description: string</text>
-<text text-anchor="start" x="238" y="-640.9" font-family="Times,serif" font-size="14.00">workClockTimeRef: uint256</text>
-</g>
-<!-- 2&#45;&gt;0 -->
-<g id="edge4" class="edge">
-<title>2&#45;&gt;0</title>
-<path fill="none" stroke="black" d="M348.17,-749.68C362.85,-805.43 393.23,-888.17 451.17,-934.8 567.72,-1028.6 999.83,-1095.51 1211.61,-1123.42"/>
-<polygon fill="black" stroke="black" points="1211.8,-1123.45 1218.27,-1120.26 1223.7,-1125.01 1217.23,-1128.19 1211.8,-1123.45"/>
+<polygon fill="#f2f2f2" stroke="black" points="3246.91,-1343.5 3246.91,-1401.9 3459.25,-1401.9 3459.25,-1343.5 3246.91,-1343.5"/>
+<text text-anchor="middle" x="3353.08" y="-1385.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
+<text text-anchor="middle" x="3353.08" y="-1368.5" font-family="Times,serif" font-size="14.00">IexecLibCore_v5</text>
+<text text-anchor="middle" x="3353.08" y="-1351.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
 </g>
 <!-- 3 -->
 <g id="node4" class="node">
 <title>3</title>
-<polygon fill="#f2f2f2" stroke="black" points="460,-624.3 460,-757.9 672.33,-757.9 672.33,-624.3 460,-624.3"/>
-<text text-anchor="middle" x="566.17" y="-741.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="566.17" y="-724.5" font-family="Times,serif" font-size="14.00">DatasetInfo</text>
-<text text-anchor="middle" x="566.17" y="-707.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
-<polyline fill="none" stroke="black" points="460,-699.5 672.33,-699.5 "/>
-<text text-anchor="start" x="468" y="-682.9" font-family="Times,serif" font-size="14.00">owner: address</text>
-<text text-anchor="start" x="468" y="-666.1" font-family="Times,serif" font-size="14.00">m_datasetName: string</text>
-<text text-anchor="start" x="468" y="-649.3" font-family="Times,serif" font-size="14.00">m_datasetMultiaddr: bytes</text>
-<text text-anchor="start" x="468" y="-632.5" font-family="Times,serif" font-size="14.00">m_datasetChecksum: bytes32</text>
-</g>
-<!-- 3&#45;&gt;0 -->
-<g id="edge5" class="edge">
-<title>3&#45;&gt;0</title>
-<path fill="none" stroke="black" d="M581.6,-758.05C597.68,-812.71 628.13,-888.68 681.17,-934.8 832.87,-1066.73 1069.91,-1113.01 1211.64,-1129.21"/>
-<polygon fill="black" stroke="black" points="1211.86,-1129.23 1218.26,-1125.92 1223.79,-1130.55 1217.38,-1133.87 1211.86,-1129.23"/>
+<polygon fill="#f2f2f2" stroke="black" points="2022.91,-1013.3 2022.91,-1113.3 2235.25,-1113.3 2235.25,-1013.3 2022.91,-1013.3"/>
+<text text-anchor="middle" x="2129.08" y="-1096.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="2129.08" y="-1079.9" font-family="Times,serif" font-size="14.00">Account</text>
+<text text-anchor="middle" x="2129.08" y="-1063.1" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polyline fill="none" stroke="black" points="2022.91,-1054.9 2235.25,-1054.9 "/>
+<text text-anchor="start" x="2030.91" y="-1038.3" font-family="Times,serif" font-size="14.00">stake: uint256</text>
+<text text-anchor="start" x="2030.91" y="-1021.5" font-family="Times,serif" font-size="14.00">locked: uint256</text>
+</g>
+<!-- 3&#45;&gt;2 -->
+<g id="edge7" class="edge">
+<title>3&#45;&gt;2</title>
+<path fill="none" stroke="black" d="M2137.1,-1113.32C2149.3,-1170.47 2178.46,-1262.75 2244.08,-1307 2324.64,-1361.33 2965.62,-1370.21 3234.75,-1371.54"/>
+<polygon fill="black" stroke="black" points="3234.9,-1371.54 3240.92,-1367.57 3246.9,-1371.59 3240.88,-1375.57 3234.9,-1371.54"/>
 </g>
 <!-- 4 -->
 <g id="node5" class="node">
 <title>4</title>
-<polygon fill="#f2f2f2" stroke="black" points="690,-607.5 690,-774.7 902.33,-774.7 902.33,-607.5 690,-607.5"/>
-<text text-anchor="middle" x="796.17" y="-758.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="796.17" y="-741.3" font-family="Times,serif" font-size="14.00">AppInfo</text>
-<text text-anchor="middle" x="796.17" y="-724.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
-<polyline fill="none" stroke="black" points="690,-716.3 902.33,-716.3 "/>
-<text text-anchor="start" x="698" y="-699.7" font-family="Times,serif" font-size="14.00">owner: address</text>
-<text text-anchor="start" x="698" y="-682.9" font-family="Times,serif" font-size="14.00">m_appName: string</text>
-<text text-anchor="start" x="698" y="-666.1" font-family="Times,serif" font-size="14.00">m_appType: string</text>
-<text text-anchor="start" x="698" y="-649.3" font-family="Times,serif" font-size="14.00">m_appMultiaddr: bytes</text>
-<text text-anchor="start" x="698" y="-632.5" font-family="Times,serif" font-size="14.00">m_appChecksum: bytes32</text>
-<text text-anchor="start" x="698" y="-615.7" font-family="Times,serif" font-size="14.00">m_appMREnclave: bytes</text>
-</g>
-<!-- 4&#45;&gt;0 -->
-<g id="edge6" class="edge">
-<title>4&#45;&gt;0</title>
-<path fill="none" stroke="black" d="M819.76,-774.98C837.85,-826.25 867.27,-890.51 911.17,-934.8 995.76,-1020.14 1123.38,-1074.85 1215.54,-1105.73"/>
-<polygon fill="black" stroke="black" points="1215.76,-1105.8 1222.71,-1103.88 1227.16,-1109.56 1220.21,-1111.48 1215.76,-1105.8"/>
+<polygon fill="#f2f2f2" stroke="black" points="2252.91,-1004.9 2252.91,-1121.7 2465.25,-1121.7 2465.25,-1004.9 2252.91,-1004.9"/>
+<text text-anchor="middle" x="2359.08" y="-1105.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="2359.08" y="-1088.3" font-family="Times,serif" font-size="14.00">Category</text>
+<text text-anchor="middle" x="2359.08" y="-1071.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polyline fill="none" stroke="black" points="2252.91,-1063.3 2465.25,-1063.3 "/>
+<text text-anchor="start" x="2260.91" y="-1046.7" font-family="Times,serif" font-size="14.00">name: string</text>
+<text text-anchor="start" x="2260.91" y="-1029.9" font-family="Times,serif" font-size="14.00">description: string</text>
+<text text-anchor="start" x="2260.91" y="-1013.1" font-family="Times,serif" font-size="14.00">workClockTimeRef: uint256</text>
+</g>
+<!-- 4&#45;&gt;2 -->
+<g id="edge8" class="edge">
+<title>4&#45;&gt;2</title>
+<path fill="none" stroke="black" d="M2369.19,-1121.96C2382.55,-1179.24 2412.06,-1264.49 2474.08,-1307 2535.31,-1348.97 3008.79,-1364.49 3234.34,-1369.54"/>
+<polygon fill="black" stroke="black" points="3234.54,-1369.54 3240.62,-1365.68 3246.53,-1369.81 3240.45,-1373.68 3234.54,-1369.54"/>
 </g>
 <!-- 5 -->
 <g id="node6" class="node">
 <title>5</title>
-<polygon fill="#f2f2f2" stroke="black" points="920.49,-624.3 920.49,-757.9 1167.84,-757.9 1167.84,-624.3 920.49,-624.3"/>
-<text text-anchor="middle" x="1044.17" y="-741.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="1044.17" y="-724.5" font-family="Times,serif" font-size="14.00">WorkerpoolInfo</text>
-<text text-anchor="middle" x="1044.17" y="-707.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
-<polyline fill="none" stroke="black" points="920.49,-699.5 1167.84,-699.5 "/>
-<text text-anchor="start" x="928.49" y="-682.9" font-family="Times,serif" font-size="14.00">owner: address</text>
-<text text-anchor="start" x="928.49" y="-666.1" font-family="Times,serif" font-size="14.00">m_workerpoolDescription: string</text>
-<text text-anchor="start" x="928.49" y="-649.3" font-family="Times,serif" font-size="14.00">m_workerStakeRatioPolicy: uint256</text>
-<text text-anchor="start" x="928.49" y="-632.5" font-family="Times,serif" font-size="14.00">m_schedulerRewardRatioPolicy: uint256</text>
-</g>
-<!-- 5&#45;&gt;0 -->
-<g id="edge7" class="edge">
-<title>5&#45;&gt;0</title>
-<path fill="none" stroke="black" d="M1078.98,-757.92C1105.78,-807.43 1144.5,-876.47 1182.17,-934.8 1220.57,-994.27 1269.74,-1059.94 1300.61,-1100.06"/>
-<polygon fill="black" stroke="black" points="1300.71,-1100.19 1307.54,-1102.5 1308.04,-1109.69 1301.21,-1107.39 1300.71,-1100.19"/>
+<polygon fill="#f2f2f2" stroke="black" points="2482.91,-996.5 2482.91,-1130.1 2695.25,-1130.1 2695.25,-996.5 2482.91,-996.5"/>
+<text text-anchor="middle" x="2589.08" y="-1113.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="2589.08" y="-1096.7" font-family="Times,serif" font-size="14.00">DatasetInfo</text>
+<text text-anchor="middle" x="2589.08" y="-1079.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polyline fill="none" stroke="black" points="2482.91,-1071.7 2695.25,-1071.7 "/>
+<text text-anchor="start" x="2490.91" y="-1055.1" font-family="Times,serif" font-size="14.00">owner: address</text>
+<text text-anchor="start" x="2490.91" y="-1038.3" font-family="Times,serif" font-size="14.00">m_datasetName: string</text>
+<text text-anchor="start" x="2490.91" y="-1021.5" font-family="Times,serif" font-size="14.00">m_datasetMultiaddr: bytes</text>
+<text text-anchor="start" x="2490.91" y="-1004.7" font-family="Times,serif" font-size="14.00">m_datasetChecksum: bytes32</text>
+</g>
+<!-- 5&#45;&gt;2 -->
+<g id="edge9" class="edge">
+<title>5&#45;&gt;2</title>
+<path fill="none" stroke="black" d="M2601.56,-1130.32C2615.98,-1186.99 2645.67,-1265.84 2704.08,-1307 2746.39,-1336.81 3059.29,-1357.04 3234.7,-1366.17"/>
+<polygon fill="black" stroke="black" points="3234.84,-1366.18 3241.04,-1362.49 3246.83,-1366.8 3240.63,-1370.48 3234.84,-1366.18"/>
 </g>
 <!-- 6 -->
 <g id="node7" class="node">
 <title>6</title>
-<polygon fill="#f2f2f2" stroke="black" points="1224,-632.7 1224,-749.5 1436.33,-749.5 1436.33,-632.7 1224,-632.7"/>
-<text text-anchor="middle" x="1330.17" y="-732.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="1330.17" y="-716.1" font-family="Times,serif" font-size="14.00">Resource</text>
-<text text-anchor="middle" x="1330.17" y="-699.3" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
-<polyline fill="none" stroke="black" points="1224,-691.1 1436.33,-691.1 "/>
-<text text-anchor="start" x="1232" y="-674.5" font-family="Times,serif" font-size="14.00">pointer: address</text>
-<text text-anchor="start" x="1232" y="-657.7" font-family="Times,serif" font-size="14.00">owner: address</text>
-<text text-anchor="start" x="1232" y="-640.9" font-family="Times,serif" font-size="14.00">price: uint256</text>
-</g>
-<!-- 6&#45;&gt;0 -->
-<g id="edge8" class="edge">
-<title>6&#45;&gt;0</title>
-<path fill="none" stroke="black" d="M1330.17,-749.92C1330.17,-841.53 1330.17,-1017.78 1330.17,-1097.26"/>
-<polygon fill="black" stroke="black" points="1330.17,-1097.61 1334.17,-1103.61 1330.17,-1109.61 1326.17,-1103.61 1330.17,-1097.61"/>
+<polygon fill="#f2f2f2" stroke="black" points="2712.91,-979.7 2712.91,-1146.9 2925.25,-1146.9 2925.25,-979.7 2712.91,-979.7"/>
+<text text-anchor="middle" x="2819.08" y="-1130.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="2819.08" y="-1113.5" font-family="Times,serif" font-size="14.00">AppInfo</text>
+<text text-anchor="middle" x="2819.08" y="-1096.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polyline fill="none" stroke="black" points="2712.91,-1088.5 2925.25,-1088.5 "/>
+<text text-anchor="start" x="2720.91" y="-1071.9" font-family="Times,serif" font-size="14.00">owner: address</text>
+<text text-anchor="start" x="2720.91" y="-1055.1" font-family="Times,serif" font-size="14.00">m_appName: string</text>
+<text text-anchor="start" x="2720.91" y="-1038.3" font-family="Times,serif" font-size="14.00">m_appType: string</text>
+<text text-anchor="start" x="2720.91" y="-1021.5" font-family="Times,serif" font-size="14.00">m_appMultiaddr: bytes</text>
+<text text-anchor="start" x="2720.91" y="-1004.7" font-family="Times,serif" font-size="14.00">m_appChecksum: bytes32</text>
+<text text-anchor="start" x="2720.91" y="-987.9" font-family="Times,serif" font-size="14.00">m_appMREnclave: bytes</text>
+</g>
+<!-- 6&#45;&gt;2 -->
+<g id="edge10" class="edge">
+<title>6&#45;&gt;2</title>
+<path fill="none" stroke="black" d="M2836.98,-1146.94C2853.11,-1201.01 2882.5,-1268.54 2934.08,-1307 2980.45,-1341.58 3127.85,-1358.09 3234.73,-1365.68"/>
+<polygon fill="black" stroke="black" points="3234.93,-1365.69 3241.19,-1362.12 3246.9,-1366.52 3240.64,-1370.1 3234.93,-1365.69"/>
 </g>
 <!-- 7 -->
 <g id="node8" class="node">
 <title>7</title>
-<polygon fill="#f2f2f2" stroke="black" points="1090,-38.1 1090,-373.3 1302.33,-373.3 1302.33,-38.1 1090,-38.1"/>
-<text text-anchor="middle" x="1196.17" y="-356.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="1196.17" y="-339.9" font-family="Times,serif" font-size="14.00">Deal</text>
-<text text-anchor="middle" x="1196.17" y="-323.1" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
-<polyline fill="none" stroke="black" points="1090,-314.9 1302.33,-314.9 "/>
-<text text-anchor="start" x="1098" y="-298.3" font-family="Times,serif" font-size="14.00">app: Resource</text>
-<text text-anchor="start" x="1098" y="-281.5" font-family="Times,serif" font-size="14.00">dataset: Resource</text>
-<text text-anchor="start" x="1098" y="-264.7" font-family="Times,serif" font-size="14.00">workerpool: Resource</text>
-<text text-anchor="start" x="1098" y="-247.9" font-family="Times,serif" font-size="14.00">trust: uint256</text>
-<text text-anchor="start" x="1098" y="-231.1" font-family="Times,serif" font-size="14.00">category: uint256</text>
-<text text-anchor="start" x="1098" y="-214.3" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
-<text text-anchor="start" x="1098" y="-197.5" font-family="Times,serif" font-size="14.00">requester: address</text>
-<text text-anchor="start" x="1098" y="-180.7" font-family="Times,serif" font-size="14.00">beneficiary: address</text>
-<text text-anchor="start" x="1098" y="-163.9" font-family="Times,serif" font-size="14.00">callback: address</text>
-<text text-anchor="start" x="1098" y="-147.1" font-family="Times,serif" font-size="14.00">params: string</text>
-<text text-anchor="start" x="1098" y="-130.3" font-family="Times,serif" font-size="14.00">startTime: uint256</text>
-<text text-anchor="start" x="1098" y="-113.5" font-family="Times,serif" font-size="14.00">botFirst: uint256</text>
-<text text-anchor="start" x="1098" y="-96.7" font-family="Times,serif" font-size="14.00">botSize: uint256</text>
-<text text-anchor="start" x="1098" y="-79.9" font-family="Times,serif" font-size="14.00">workerStake: uint256</text>
-<text text-anchor="start" x="1098" y="-63.1" font-family="Times,serif" font-size="14.00">schedulerRewardRatio: uint256</text>
-<text text-anchor="start" x="1098" y="-46.3" font-family="Times,serif" font-size="14.00">sponsor: address</text>
-</g>
-<!-- 7&#45;&gt;0 -->
-<g id="edge9" class="edge">
-<title>7&#45;&gt;0</title>
-<path fill="none" stroke="black" d="M1191.21,-373.44C1187.45,-555.05 1186.98,-833.21 1215.17,-934.8 1232.47,-997.17 1272.95,-1060.77 1300.95,-1099.79"/>
-<polygon fill="black" stroke="black" points="1301.06,-1099.95 1307.83,-1102.44 1308.13,-1109.65 1301.36,-1107.15 1301.06,-1099.95"/>
-</g>
-<!-- 7&#45;&gt;6 -->
-<g id="edge14" class="edge">
-<title>7&#45;&gt;6</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1242.38,-373.4C1266.08,-458.91 1293.64,-558.33 1311.47,-622.64"/>
-<polygon fill="black" stroke="black" points="1308.2,-623.95 1314.24,-632.65 1314.94,-622.08 1308.2,-623.95"/>
+<polygon fill="#f2f2f2" stroke="black" points="2943.4,-996.5 2943.4,-1130.1 3190.75,-1130.1 3190.75,-996.5 2943.4,-996.5"/>
+<text text-anchor="middle" x="3067.08" y="-1113.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="3067.08" y="-1096.7" font-family="Times,serif" font-size="14.00">WorkerpoolInfo</text>
+<text text-anchor="middle" x="3067.08" y="-1079.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polyline fill="none" stroke="black" points="2943.4,-1071.7 3190.75,-1071.7 "/>
+<text text-anchor="start" x="2951.4" y="-1055.1" font-family="Times,serif" font-size="14.00">owner: address</text>
+<text text-anchor="start" x="2951.4" y="-1038.3" font-family="Times,serif" font-size="14.00">m_workerpoolDescription: string</text>
+<text text-anchor="start" x="2951.4" y="-1021.5" font-family="Times,serif" font-size="14.00">m_workerStakeRatioPolicy: uint256</text>
+<text text-anchor="start" x="2951.4" y="-1004.7" font-family="Times,serif" font-size="14.00">m_schedulerRewardRatioPolicy: uint256</text>
+</g>
+<!-- 7&#45;&gt;2 -->
+<g id="edge11" class="edge">
+<title>7&#45;&gt;2</title>
+<path fill="none" stroke="black" d="M3090.9,-1130.19C3113.21,-1183.89 3151.22,-1258.52 3205.08,-1307 3218.84,-1319.39 3235.35,-1329.69 3252.28,-1338.16"/>
+<polygon fill="black" stroke="black" points="3252.59,-1338.31 3259.73,-1337.28 3263.43,-1343.46 3256.3,-1344.5 3252.59,-1338.31"/>
 </g>
 <!-- 8 -->
 <g id="node9" class="node">
 <title>8</title>
-<polygon fill="#f2f2f2" stroke="black" points="1454,-540.3 1454,-841.9 1666.33,-841.9 1666.33,-540.3 1454,-540.3"/>
-<text text-anchor="middle" x="1560.17" y="-825.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="1560.17" y="-808.5" font-family="Times,serif" font-size="14.00">DealBoost</text>
-<text text-anchor="middle" x="1560.17" y="-791.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
-<polyline fill="none" stroke="black" points="1454,-783.5 1666.33,-783.5 "/>
-<text text-anchor="start" x="1462" y="-766.9" font-family="Times,serif" font-size="14.00">appOwner: address</text>
-<text text-anchor="start" x="1462" y="-750.1" font-family="Times,serif" font-size="14.00">appPrice: uint96</text>
-<text text-anchor="start" x="1462" y="-733.3" font-family="Times,serif" font-size="14.00">datasetOwner: address</text>
-<text text-anchor="start" x="1462" y="-716.5" font-family="Times,serif" font-size="14.00">datasetPrice: uint96</text>
-<text text-anchor="start" x="1462" y="-699.7" font-family="Times,serif" font-size="14.00">workerpoolOwner: address</text>
-<text text-anchor="start" x="1462" y="-682.9" font-family="Times,serif" font-size="14.00">workerpoolPrice: uint96</text>
-<text text-anchor="start" x="1462" y="-666.1" font-family="Times,serif" font-size="14.00">requester: address</text>
-<text text-anchor="start" x="1462" y="-649.3" font-family="Times,serif" font-size="14.00">workerReward: uint96</text>
-<text text-anchor="start" x="1462" y="-632.5" font-family="Times,serif" font-size="14.00">callback: address</text>
-<text text-anchor="start" x="1462" y="-615.7" font-family="Times,serif" font-size="14.00">deadline: uint40</text>
-<text text-anchor="start" x="1462" y="-598.9" font-family="Times,serif" font-size="14.00">botFirst: uint16</text>
-<text text-anchor="start" x="1462" y="-582.1" font-family="Times,serif" font-size="14.00">botSize: uint16</text>
-<text text-anchor="start" x="1462" y="-565.3" font-family="Times,serif" font-size="14.00">shortTag: bytes3</text>
-<text text-anchor="start" x="1462" y="-548.5" font-family="Times,serif" font-size="14.00">sponsor: address</text>
-</g>
-<!-- 8&#45;&gt;0 -->
-<g id="edge10" class="edge">
-<title>8&#45;&gt;0</title>
-<path fill="none" stroke="black" d="M1491.16,-842.15C1476.39,-873 1460.58,-905.11 1445.17,-934.8 1414.98,-992.94 1377.06,-1058.65 1353.21,-1099.18"/>
-<polygon fill="black" stroke="black" points="1353.12,-1099.33 1353.51,-1106.53 1347.02,-1109.67 1346.62,-1102.47 1353.12,-1099.33"/>
+<polygon fill="#f2f2f2" stroke="black" points="3246.91,-1004.9 3246.91,-1121.7 3459.25,-1121.7 3459.25,-1004.9 3246.91,-1004.9"/>
+<text text-anchor="middle" x="3353.08" y="-1105.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="3353.08" y="-1088.3" font-family="Times,serif" font-size="14.00">Resource</text>
+<text text-anchor="middle" x="3353.08" y="-1071.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polyline fill="none" stroke="black" points="3246.91,-1063.3 3459.25,-1063.3 "/>
+<text text-anchor="start" x="3254.91" y="-1046.7" font-family="Times,serif" font-size="14.00">pointer: address</text>
+<text text-anchor="start" x="3254.91" y="-1029.9" font-family="Times,serif" font-size="14.00">owner: address</text>
+<text text-anchor="start" x="3254.91" y="-1013.1" font-family="Times,serif" font-size="14.00">price: uint256</text>
+</g>
+<!-- 8&#45;&gt;2 -->
+<g id="edge12" class="edge">
+<title>8&#45;&gt;2</title>
+<path fill="none" stroke="black" d="M3353.08,-1121.76C3353.08,-1182.73 3353.08,-1277.52 3353.08,-1331.13"/>
+<polygon fill="black" stroke="black" points="3353.08,-1331.2 3357.08,-1337.2 3353.08,-1343.2 3349.08,-1337.2 3353.08,-1331.2"/>
 </g>
 <!-- 9 -->
 <g id="node10" class="node">
 <title>9</title>
-<polygon fill="#f2f2f2" stroke="black" points="1722,-615.9 1722,-766.3 1934.33,-766.3 1934.33,-615.9 1722,-615.9"/>
-<text text-anchor="middle" x="1828.17" y="-749.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Enum&gt;&gt;</text>
-<text text-anchor="middle" x="1828.17" y="-732.9" font-family="Times,serif" font-size="14.00">TaskStatusEnum</text>
-<text text-anchor="middle" x="1828.17" y="-716.1" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
-<polyline fill="none" stroke="black" points="1722,-707.9 1934.33,-707.9 "/>
-<text text-anchor="start" x="1730" y="-691.3" font-family="Times,serif" font-size="14.00">UNSET: 0</text>
-<text text-anchor="start" x="1730" y="-674.5" font-family="Times,serif" font-size="14.00">ACTIVE: 1</text>
-<text text-anchor="start" x="1730" y="-657.7" font-family="Times,serif" font-size="14.00">REVEALING: 2</text>
-<text text-anchor="start" x="1730" y="-640.9" font-family="Times,serif" font-size="14.00">COMPLETED: 3</text>
-<text text-anchor="start" x="1730" y="-624.1" font-family="Times,serif" font-size="14.00">FAILED: 4</text>
-</g>
-<!-- 9&#45;&gt;0 -->
-<g id="edge1" class="edge">
-<title>9&#45;&gt;0</title>
-<path fill="none" stroke="black" d="M1805.06,-766.46C1785.84,-818.61 1754.15,-887.23 1708.17,-934.8 1629.09,-1016.61 1509.82,-1073.09 1426.47,-1105.35"/>
-<polygon fill="black" stroke="black" points="1426.42,-1105.37 1422.24,-1111.24 1415.21,-1109.64 1419.39,-1103.77 1426.42,-1105.37"/>
+<polygon fill="#f2f2f2" stroke="black" points="3112.91,-447.9 3112.91,-783.1 3325.25,-783.1 3325.25,-447.9 3112.91,-447.9"/>
+<text text-anchor="middle" x="3219.08" y="-766.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="3219.08" y="-749.7" font-family="Times,serif" font-size="14.00">Deal</text>
+<text text-anchor="middle" x="3219.08" y="-732.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polyline fill="none" stroke="black" points="3112.91,-724.7 3325.25,-724.7 "/>
+<text text-anchor="start" x="3120.91" y="-708.1" font-family="Times,serif" font-size="14.00">app: Resource</text>
+<text text-anchor="start" x="3120.91" y="-691.3" font-family="Times,serif" font-size="14.00">dataset: Resource</text>
+<text text-anchor="start" x="3120.91" y="-674.5" font-family="Times,serif" font-size="14.00">workerpool: Resource</text>
+<text text-anchor="start" x="3120.91" y="-657.7" font-family="Times,serif" font-size="14.00">trust: uint256</text>
+<text text-anchor="start" x="3120.91" y="-640.9" font-family="Times,serif" font-size="14.00">category: uint256</text>
+<text text-anchor="start" x="3120.91" y="-624.1" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
+<text text-anchor="start" x="3120.91" y="-607.3" font-family="Times,serif" font-size="14.00">requester: address</text>
+<text text-anchor="start" x="3120.91" y="-590.5" font-family="Times,serif" font-size="14.00">beneficiary: address</text>
+<text text-anchor="start" x="3120.91" y="-573.7" font-family="Times,serif" font-size="14.00">callback: address</text>
+<text text-anchor="start" x="3120.91" y="-556.9" font-family="Times,serif" font-size="14.00">params: string</text>
+<text text-anchor="start" x="3120.91" y="-540.1" font-family="Times,serif" font-size="14.00">startTime: uint256</text>
+<text text-anchor="start" x="3120.91" y="-523.3" font-family="Times,serif" font-size="14.00">botFirst: uint256</text>
+<text text-anchor="start" x="3120.91" y="-506.5" font-family="Times,serif" font-size="14.00">botSize: uint256</text>
+<text text-anchor="start" x="3120.91" y="-489.7" font-family="Times,serif" font-size="14.00">workerStake: uint256</text>
+<text text-anchor="start" x="3120.91" y="-472.9" font-family="Times,serif" font-size="14.00">schedulerRewardRatio: uint256</text>
+<text text-anchor="start" x="3120.91" y="-456.1" font-family="Times,serif" font-size="14.00">sponsor: address</text>
+</g>
+<!-- 9&#45;&gt;2 -->
+<g id="edge13" class="edge">
+<title>9&#45;&gt;2</title>
+<path fill="none" stroke="black" d="M3215.16,-783.15C3212.01,-973.18 3211.75,-1263.36 3238.08,-1307 3245.17,-1318.76 3255.25,-1328.56 3266.52,-1336.67"/>
+<polygon fill="black" stroke="black" points="3266.67,-1336.77 3273.88,-1336.73 3276.69,-1343.37 3269.48,-1343.41 3266.67,-1336.77"/>
+</g>
+<!-- 9&#45;&gt;8 -->
+<g id="edge18" class="edge">
+<title>9&#45;&gt;8</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3269.17,-783.13C3291.26,-856.62 3315.97,-938.85 3332.82,-994.91"/>
+<polygon fill="black" stroke="black" points="3329.54,-996.15 3335.77,-1004.72 3336.24,-994.13 3329.54,-996.15"/>
 </g>
 <!-- 10 -->
 <g id="node11" class="node">
 <title>10</title>
-<polygon fill="#f2f2f2" stroke="black" points="1588,-46.5 1588,-364.9 1800.33,-364.9 1800.33,-46.5 1588,-46.5"/>
-<text text-anchor="middle" x="1694.17" y="-348.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="1694.17" y="-331.5" font-family="Times,serif" font-size="14.00">Task</text>
-<text text-anchor="middle" x="1694.17" y="-314.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
-<polyline fill="none" stroke="black" points="1588,-306.5 1800.33,-306.5 "/>
-<text text-anchor="start" x="1596" y="-289.9" font-family="Times,serif" font-size="14.00">status: TaskStatusEnum</text>
-<text text-anchor="start" x="1596" y="-273.1" font-family="Times,serif" font-size="14.00">dealid: bytes32</text>
-<text text-anchor="start" x="1596" y="-256.3" font-family="Times,serif" font-size="14.00">idx: uint256</text>
-<text text-anchor="start" x="1596" y="-239.5" font-family="Times,serif" font-size="14.00">timeref: uint256</text>
-<text text-anchor="start" x="1596" y="-222.7" font-family="Times,serif" font-size="14.00">contributionDeadline: uint256</text>
-<text text-anchor="start" x="1596" y="-205.9" font-family="Times,serif" font-size="14.00">revealDeadline: uint256</text>
-<text text-anchor="start" x="1596" y="-189.1" font-family="Times,serif" font-size="14.00">finalDeadline: uint256</text>
-<text text-anchor="start" x="1596" y="-172.3" font-family="Times,serif" font-size="14.00">consensusValue: bytes32</text>
-<text text-anchor="start" x="1596" y="-155.5" font-family="Times,serif" font-size="14.00">revealCounter: uint256</text>
-<text text-anchor="start" x="1596" y="-138.7" font-family="Times,serif" font-size="14.00">winnerCounter: uint256</text>
-<text text-anchor="start" x="1596" y="-121.9" font-family="Times,serif" font-size="14.00">contributors: address[]</text>
-<text text-anchor="start" x="1596" y="-105.1" font-family="Times,serif" font-size="14.00">resultDigest: bytes32</text>
-<text text-anchor="start" x="1596" y="-88.3" font-family="Times,serif" font-size="14.00">results: bytes</text>
-<text text-anchor="start" x="1596" y="-71.5" font-family="Times,serif" font-size="14.00">resultsTimestamp: uint256</text>
-<text text-anchor="start" x="1596" y="-54.7" font-family="Times,serif" font-size="14.00">resultsCallback: bytes</text>
-</g>
-<!-- 10&#45;&gt;0 -->
-<g id="edge11" class="edge">
-<title>10&#45;&gt;0</title>
-<path fill="none" stroke="black" d="M1698.1,-364.93C1701.82,-564.4 1703.25,-887.14 1675.17,-934.8 1624.05,-1021.56 1520.3,-1075.16 1439.86,-1105.36"/>
-<polygon fill="black" stroke="black" points="1439.44,-1105.51 1435.18,-1111.33 1428.17,-1109.64 1432.43,-1103.82 1439.44,-1105.51"/>
-</g>
-<!-- 10&#45;&gt;9 -->
-<g id="edge15" class="edge">
-<title>10&#45;&gt;9</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1738.04,-364.98C1760.3,-445.26 1786.43,-539.52 1804.81,-605.82"/>
-<polygon fill="black" stroke="black" points="1801.53,-607.1 1807.57,-615.81 1808.27,-605.23 1801.53,-607.1"/>
+<polygon fill="#f2f2f2" stroke="black" points="3476.91,-912.5 3476.91,-1214.1 3689.25,-1214.1 3689.25,-912.5 3476.91,-912.5"/>
+<text text-anchor="middle" x="3583.08" y="-1197.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="3583.08" y="-1180.7" font-family="Times,serif" font-size="14.00">DealBoost</text>
+<text text-anchor="middle" x="3583.08" y="-1163.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polyline fill="none" stroke="black" points="3476.91,-1155.7 3689.25,-1155.7 "/>
+<text text-anchor="start" x="3484.91" y="-1139.1" font-family="Times,serif" font-size="14.00">appOwner: address</text>
+<text text-anchor="start" x="3484.91" y="-1122.3" font-family="Times,serif" font-size="14.00">appPrice: uint96</text>
+<text text-anchor="start" x="3484.91" y="-1105.5" font-family="Times,serif" font-size="14.00">datasetOwner: address</text>
+<text text-anchor="start" x="3484.91" y="-1088.7" font-family="Times,serif" font-size="14.00">datasetPrice: uint96</text>
+<text text-anchor="start" x="3484.91" y="-1071.9" font-family="Times,serif" font-size="14.00">workerpoolOwner: address</text>
+<text text-anchor="start" x="3484.91" y="-1055.1" font-family="Times,serif" font-size="14.00">workerpoolPrice: uint96</text>
+<text text-anchor="start" x="3484.91" y="-1038.3" font-family="Times,serif" font-size="14.00">requester: address</text>
+<text text-anchor="start" x="3484.91" y="-1021.5" font-family="Times,serif" font-size="14.00">workerReward: uint96</text>
+<text text-anchor="start" x="3484.91" y="-1004.7" font-family="Times,serif" font-size="14.00">callback: address</text>
+<text text-anchor="start" x="3484.91" y="-987.9" font-family="Times,serif" font-size="14.00">deadline: uint40</text>
+<text text-anchor="start" x="3484.91" y="-971.1" font-family="Times,serif" font-size="14.00">botFirst: uint16</text>
+<text text-anchor="start" x="3484.91" y="-954.3" font-family="Times,serif" font-size="14.00">botSize: uint16</text>
+<text text-anchor="start" x="3484.91" y="-937.5" font-family="Times,serif" font-size="14.00">shortTag: bytes3</text>
+<text text-anchor="start" x="3484.91" y="-920.7" font-family="Times,serif" font-size="14.00">sponsor: address</text>
+</g>
+<!-- 10&#45;&gt;2 -->
+<g id="edge14" class="edge">
+<title>10&#45;&gt;2</title>
+<path fill="none" stroke="black" d="M3529.73,-1214.24C3513.37,-1247.27 3492.96,-1280.31 3468.08,-1307 3457.25,-1318.62 3443.85,-1328.69 3430.07,-1337.19"/>
+<polygon fill="black" stroke="black" points="3429.84,-1337.33 3426.69,-1343.81 3419.49,-1343.4 3422.64,-1336.91 3429.84,-1337.33"/>
 </g>
 <!-- 11 -->
 <g id="node12" class="node">
 <title>11</title>
-<polygon fill="#f2f2f2" stroke="black" points="1951.92,-641.1 1951.92,-741.1 2168.41,-741.1 2168.41,-641.1 1951.92,-641.1"/>
-<text text-anchor="middle" x="2060.17" y="-724.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="2060.17" y="-707.7" font-family="Times,serif" font-size="14.00">Consensus</text>
-<text text-anchor="middle" x="2060.17" y="-690.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
-<polyline fill="none" stroke="black" points="1951.92,-682.7 2168.41,-682.7 "/>
-<text text-anchor="start" x="1959.92" y="-666.1" font-family="Times,serif" font-size="14.00">group: mapping(bytes32=&gt;uint256)</text>
-<text text-anchor="start" x="1959.92" y="-649.3" font-family="Times,serif" font-size="14.00">total: uint256</text>
-</g>
-<!-- 11&#45;&gt;0 -->
-<g id="edge12" class="edge">
-<title>11&#45;&gt;0</title>
-<path fill="none" stroke="black" d="M2048.72,-741.5C2033.57,-796.2 2001.68,-883.4 1943.17,-934.8 1802.02,-1058.78 1583.01,-1107.48 1448.55,-1126.32"/>
-<polygon fill="black" stroke="black" points="1448.5,-1126.33 1443.09,-1131.1 1436.61,-1127.95 1442.01,-1123.17 1448.5,-1126.33"/>
+<polygon fill="#f2f2f2" stroke="black" points="3744.91,-988.1 3744.91,-1138.5 3957.25,-1138.5 3957.25,-988.1 3744.91,-988.1"/>
+<text text-anchor="middle" x="3851.08" y="-1121.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Enum&gt;&gt;</text>
+<text text-anchor="middle" x="3851.08" y="-1105.1" font-family="Times,serif" font-size="14.00">TaskStatusEnum</text>
+<text text-anchor="middle" x="3851.08" y="-1088.3" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polyline fill="none" stroke="black" points="3744.91,-1080.1 3957.25,-1080.1 "/>
+<text text-anchor="start" x="3752.91" y="-1063.5" font-family="Times,serif" font-size="14.00">UNSET: 0</text>
+<text text-anchor="start" x="3752.91" y="-1046.7" font-family="Times,serif" font-size="14.00">ACTIVE: 1</text>
+<text text-anchor="start" x="3752.91" y="-1029.9" font-family="Times,serif" font-size="14.00">REVEALING: 2</text>
+<text text-anchor="start" x="3752.91" y="-1013.1" font-family="Times,serif" font-size="14.00">COMPLETED: 3</text>
+<text text-anchor="start" x="3752.91" y="-996.3" font-family="Times,serif" font-size="14.00">FAILED: 4</text>
+</g>
+<!-- 11&#45;&gt;2 -->
+<g id="edge5" class="edge">
+<title>11&#45;&gt;2</title>
+<path fill="none" stroke="black" d="M3833.78,-1138.64C3816.96,-1193.81 3785.72,-1266.27 3731.08,-1307 3690.83,-1337 3566.83,-1354.11 3471.72,-1363.1"/>
+<polygon fill="black" stroke="black" points="3471.64,-1363.11 3466.03,-1367.64 3459.69,-1364.21 3465.29,-1359.68 3471.64,-1363.11"/>
 </g>
 <!-- 12 -->
 <g id="node13" class="node">
 <title>12</title>
-<polygon fill="#f2f2f2" stroke="black" points="2224,-624.3 2224,-757.9 2436.33,-757.9 2436.33,-624.3 2224,-624.3"/>
-<text text-anchor="middle" x="2330.17" y="-741.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Enum&gt;&gt;</text>
-<text text-anchor="middle" x="2330.17" y="-724.5" font-family="Times,serif" font-size="14.00">ContributionStatusEnum</text>
-<text text-anchor="middle" x="2330.17" y="-707.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
-<polyline fill="none" stroke="black" points="2224,-699.5 2436.33,-699.5 "/>
-<text text-anchor="start" x="2232" y="-682.9" font-family="Times,serif" font-size="14.00">UNSET: 0</text>
-<text text-anchor="start" x="2232" y="-666.1" font-family="Times,serif" font-size="14.00">CONTRIBUTED: 1</text>
-<text text-anchor="start" x="2232" y="-649.3" font-family="Times,serif" font-size="14.00">PROVED: 2</text>
-<text text-anchor="start" x="2232" y="-632.5" font-family="Times,serif" font-size="14.00">REJECTED: 3</text>
-</g>
-<!-- 12&#45;&gt;0 -->
-<g id="edge2" class="edge">
-<title>12&#45;&gt;0</title>
-<path fill="none" stroke="black" d="M2314.51,-758.05C2297.9,-813.48 2266.11,-890.55 2210.17,-934.8 2092.7,-1027.71 1660.49,-1095.06 1448.7,-1123.25"/>
-<polygon fill="black" stroke="black" points="1448.52,-1123.28 1443.1,-1128.03 1436.62,-1124.85 1442.05,-1120.1 1448.52,-1123.28"/>
+<polygon fill="#f2f2f2" stroke="black" points="3610.91,-456.3 3610.91,-774.7 3823.25,-774.7 3823.25,-456.3 3610.91,-456.3"/>
+<text text-anchor="middle" x="3717.08" y="-758.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="3717.08" y="-741.3" font-family="Times,serif" font-size="14.00">Task</text>
+<text text-anchor="middle" x="3717.08" y="-724.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polyline fill="none" stroke="black" points="3610.91,-716.3 3823.25,-716.3 "/>
+<text text-anchor="start" x="3618.91" y="-699.7" font-family="Times,serif" font-size="14.00">status: TaskStatusEnum</text>
+<text text-anchor="start" x="3618.91" y="-682.9" font-family="Times,serif" font-size="14.00">dealid: bytes32</text>
+<text text-anchor="start" x="3618.91" y="-666.1" font-family="Times,serif" font-size="14.00">idx: uint256</text>
+<text text-anchor="start" x="3618.91" y="-649.3" font-family="Times,serif" font-size="14.00">timeref: uint256</text>
+<text text-anchor="start" x="3618.91" y="-632.5" font-family="Times,serif" font-size="14.00">contributionDeadline: uint256</text>
+<text text-anchor="start" x="3618.91" y="-615.7" font-family="Times,serif" font-size="14.00">revealDeadline: uint256</text>
+<text text-anchor="start" x="3618.91" y="-598.9" font-family="Times,serif" font-size="14.00">finalDeadline: uint256</text>
+<text text-anchor="start" x="3618.91" y="-582.1" font-family="Times,serif" font-size="14.00">consensusValue: bytes32</text>
+<text text-anchor="start" x="3618.91" y="-565.3" font-family="Times,serif" font-size="14.00">revealCounter: uint256</text>
+<text text-anchor="start" x="3618.91" y="-548.5" font-family="Times,serif" font-size="14.00">winnerCounter: uint256</text>
+<text text-anchor="start" x="3618.91" y="-531.7" font-family="Times,serif" font-size="14.00">contributors: address[]</text>
+<text text-anchor="start" x="3618.91" y="-514.9" font-family="Times,serif" font-size="14.00">resultDigest: bytes32</text>
+<text text-anchor="start" x="3618.91" y="-498.1" font-family="Times,serif" font-size="14.00">results: bytes</text>
+<text text-anchor="start" x="3618.91" y="-481.3" font-family="Times,serif" font-size="14.00">resultsTimestamp: uint256</text>
+<text text-anchor="start" x="3618.91" y="-464.5" font-family="Times,serif" font-size="14.00">resultsCallback: bytes</text>
+</g>
+<!-- 12&#45;&gt;2 -->
+<g id="edge15" class="edge">
+<title>12&#45;&gt;2</title>
+<path fill="none" stroke="black" d="M3723,-774.74C3728.59,-966.08 3731.75,-1267.55 3698.08,-1307 3669,-1341.07 3559.57,-1357.35 3471.65,-1365.03"/>
+<polygon fill="black" stroke="black" points="3471.63,-1365.03 3465.99,-1369.52 3459.67,-1366.04 3465.32,-1361.55 3471.63,-1365.03"/>
+</g>
+<!-- 12&#45;&gt;11 -->
+<g id="edge19" class="edge">
+<title>12&#45;&gt;11</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3764.7,-774.93C3785.32,-843.54 3808.62,-921.06 3825.82,-978.28"/>
+<polygon fill="black" stroke="black" points="3822.52,-979.44 3828.75,-988 3829.22,-977.42 3822.52,-979.44"/>
 </g>
 <!-- 13 -->
 <g id="node14" class="node">
 <title>13</title>
-<polygon fill="#f2f2f2" stroke="black" points="2090,-130.5 2090,-280.9 2302.33,-280.9 2302.33,-130.5 2090,-130.5"/>
-<text text-anchor="middle" x="2196.17" y="-264.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="2196.17" y="-247.5" font-family="Times,serif" font-size="14.00">Contribution</text>
-<text text-anchor="middle" x="2196.17" y="-230.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
-<polyline fill="none" stroke="black" points="2090,-222.5 2302.33,-222.5 "/>
-<text text-anchor="start" x="2098" y="-205.9" font-family="Times,serif" font-size="14.00">status: ContributionStatusEnum</text>
-<text text-anchor="start" x="2098" y="-189.1" font-family="Times,serif" font-size="14.00">resultHash: bytes32</text>
-<text text-anchor="start" x="2098" y="-172.3" font-family="Times,serif" font-size="14.00">resultSeal: bytes32</text>
-<text text-anchor="start" x="2098" y="-155.5" font-family="Times,serif" font-size="14.00">enclaveChallenge: address</text>
-<text text-anchor="start" x="2098" y="-138.7" font-family="Times,serif" font-size="14.00">weight: uint256</text>
-</g>
-<!-- 13&#45;&gt;0 -->
-<g id="edge13" class="edge">
-<title>13&#45;&gt;0</title>
-<path fill="none" stroke="black" d="M2199.26,-280.99C2205.84,-456.32 2217.56,-884.93 2177.17,-934.8 2086.26,-1047.05 1659.34,-1104.87 1448.54,-1126.99"/>
-<polygon fill="black" stroke="black" points="1448.44,-1127 1442.89,-1131.59 1436.51,-1128.23 1442.06,-1123.64 1448.44,-1127"/>
-</g>
-<!-- 13&#45;&gt;12 -->
+<polygon fill="#f2f2f2" stroke="black" points="3974.83,-1013.3 3974.83,-1113.3 4191.32,-1113.3 4191.32,-1013.3 3974.83,-1013.3"/>
+<text text-anchor="middle" x="4083.08" y="-1096.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="4083.08" y="-1079.9" font-family="Times,serif" font-size="14.00">Consensus</text>
+<text text-anchor="middle" x="4083.08" y="-1063.1" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polyline fill="none" stroke="black" points="3974.83,-1054.9 4191.32,-1054.9 "/>
+<text text-anchor="start" x="3982.83" y="-1038.3" font-family="Times,serif" font-size="14.00">group: mapping(bytes32=&gt;uint256)</text>
+<text text-anchor="start" x="3982.83" y="-1021.5" font-family="Times,serif" font-size="14.00">total: uint256</text>
+</g>
+<!-- 13&#45;&gt;2 -->
 <g id="edge16" class="edge">
-<title>13&#45;&gt;12</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2216.74,-280.91C2241.8,-371.3 2283.9,-523.19 2309.16,-614.3"/>
-<polygon fill="black" stroke="black" points="2305.8,-615.31 2311.85,-624.01 2312.55,-613.44 2305.8,-615.31"/>
+<title>13&#45;&gt;2</title>
+<path fill="none" stroke="black" d="M4074.18,-1113.32C4061.09,-1170.03 4030.81,-1261.43 3966.08,-1307 3888.92,-1361.32 3627.17,-1371.5 3471.77,-1372.58"/>
+<polygon fill="black" stroke="black" points="3471.38,-1372.58 3465.4,-1376.62 3459.38,-1372.65 3465.36,-1368.62 3471.38,-1372.58"/>
 </g>
 <!-- 14 -->
 <g id="node15" class="node">
 <title>14</title>
-<polygon fill="#f2f2f2" stroke="black" points="3616.4,-0.5 3616.4,-410.9 4049.93,-410.9 4049.93,-0.5 3616.4,-0.5"/>
-<text text-anchor="middle" x="3833.17" y="-394.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
-<text text-anchor="middle" x="3833.17" y="-377.5" font-family="Times,serif" font-size="14.00">IexecLibOrders_v5</text>
-<text text-anchor="middle" x="3833.17" y="-360.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="3616.4,-352.5 4049.93,-352.5 "/>
-<text text-anchor="start" x="3624.4" y="-335.9" font-family="Times,serif" font-size="14.00">Public:</text>
-<text text-anchor="start" x="3624.4" y="-319.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;EIP712DOMAIN_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="3624.4" y="-302.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;APPORDER_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="3624.4" y="-285.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;DATASETORDER_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="3624.4" y="-268.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;WORKERPOOLORDER_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="3624.4" y="-251.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;REQUESTORDER_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="3624.4" y="-235.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;APPORDEROPERATION_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="3624.4" y="-218.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;DATASETORDEROPERATION_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="3624.4" y="-201.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;WORKERPOOLORDEROPERATION_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="3624.4" y="-184.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;REQUESTORDEROPERATION_TYPEHASH: bytes32</text>
-<polyline fill="none" stroke="black" points="3616.4,-176.5 4049.93,-176.5 "/>
-<text text-anchor="start" x="3624.4" y="-159.9" font-family="Times,serif" font-size="14.00">Public:</text>
-<text text-anchor="start" x="3624.4" y="-143.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_domain: EIP712Domain): (domainhash: bytes32)</text>
-<text text-anchor="start" x="3624.4" y="-126.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_apporder: AppOrder): (apphash: bytes32)</text>
-<text text-anchor="start" x="3624.4" y="-109.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_datasetorder: DatasetOrder): (datasethash: bytes32)</text>
-<text text-anchor="start" x="3624.4" y="-92.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_workerpoolorder: WorkerpoolOrder): (workerpoolhash: bytes32)</text>
-<text text-anchor="start" x="3624.4" y="-75.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_requestorder: RequestOrder): (requesthash: bytes32)</text>
-<text text-anchor="start" x="3624.4" y="-59.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_apporderoperation: AppOrderOperation): bytes32</text>
-<text text-anchor="start" x="3624.4" y="-42.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_datasetorderoperation: DatasetOrderOperation): bytes32</text>
-<text text-anchor="start" x="3624.4" y="-25.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_workerpoolorderoperation: WorkerpoolOrderOperation): bytes32</text>
-<text text-anchor="start" x="3624.4" y="-8.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_requestorderoperation: RequestOrderOperation): bytes32</text>
+<polygon fill="#f2f2f2" stroke="black" points="4246.91,-996.5 4246.91,-1130.1 4459.25,-1130.1 4459.25,-996.5 4246.91,-996.5"/>
+<text text-anchor="middle" x="4353.08" y="-1113.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Enum&gt;&gt;</text>
+<text text-anchor="middle" x="4353.08" y="-1096.7" font-family="Times,serif" font-size="14.00">ContributionStatusEnum</text>
+<text text-anchor="middle" x="4353.08" y="-1079.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polyline fill="none" stroke="black" points="4246.91,-1071.7 4459.25,-1071.7 "/>
+<text text-anchor="start" x="4254.91" y="-1055.1" font-family="Times,serif" font-size="14.00">UNSET: 0</text>
+<text text-anchor="start" x="4254.91" y="-1038.3" font-family="Times,serif" font-size="14.00">CONTRIBUTED: 1</text>
+<text text-anchor="start" x="4254.91" y="-1021.5" font-family="Times,serif" font-size="14.00">PROVED: 2</text>
+<text text-anchor="start" x="4254.91" y="-1004.7" font-family="Times,serif" font-size="14.00">REJECTED: 3</text>
+</g>
+<!-- 14&#45;&gt;2 -->
+<g id="edge6" class="edge">
+<title>14&#45;&gt;2</title>
+<path fill="none" stroke="black" d="M4339.63,-1130.21C4324.25,-1187.22 4293.03,-1266.64 4233.08,-1307 4171.39,-1348.53 3696.99,-1364.28 3471.46,-1369.47"/>
+<polygon fill="black" stroke="black" points="3471.27,-1369.47 3465.36,-1373.61 3459.27,-1369.74 3465.18,-1365.61 3471.27,-1369.47"/>
+</g>
+<!-- 15 -->
+<g id="node16" class="node">
+<title>15</title>
+<polygon fill="#f2f2f2" stroke="black" points="4112.91,-540.3 4112.91,-690.7 4325.25,-690.7 4325.25,-540.3 4112.91,-540.3"/>
+<text text-anchor="middle" x="4219.08" y="-674.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="4219.08" y="-657.3" font-family="Times,serif" font-size="14.00">Contribution</text>
+<text text-anchor="middle" x="4219.08" y="-640.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polyline fill="none" stroke="black" points="4112.91,-632.3 4325.25,-632.3 "/>
+<text text-anchor="start" x="4120.91" y="-615.7" font-family="Times,serif" font-size="14.00">status: ContributionStatusEnum</text>
+<text text-anchor="start" x="4120.91" y="-598.9" font-family="Times,serif" font-size="14.00">resultHash: bytes32</text>
+<text text-anchor="start" x="4120.91" y="-582.1" font-family="Times,serif" font-size="14.00">resultSeal: bytes32</text>
+<text text-anchor="start" x="4120.91" y="-565.3" font-family="Times,serif" font-size="14.00">enclaveChallenge: address</text>
+<text text-anchor="start" x="4120.91" y="-548.5" font-family="Times,serif" font-size="14.00">weight: uint256</text>
+</g>
+<!-- 15&#45;&gt;2 -->
+<g id="edge17" class="edge">
+<title>15&#45;&gt;2</title>
+<path fill="none" stroke="black" d="M4222.51,-690.8C4229.57,-860.08 4241.77,-1263.23 4200.08,-1307 4150.92,-1358.62 3692.88,-1369.17 3471.62,-1371.25"/>
+<polygon fill="black" stroke="black" points="3471.33,-1371.25 3465.36,-1375.3 3459.33,-1371.36 3465.29,-1367.3 3471.33,-1371.25"/>
+</g>
+<!-- 15&#45;&gt;14 -->
+<g id="edge20" class="edge">
+<title>15&#45;&gt;14</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4241.43,-690.87C4266.08,-772.87 4305.53,-904.11 4330.34,-986.64"/>
+<polygon fill="black" stroke="black" points="4327.05,-987.88 4333.29,-996.45 4333.76,-985.87 4327.05,-987.88"/>
 </g>
 <!-- 16 -->
 <g id="node17" class="node">
 <title>16</title>
-<polygon fill="#f2f2f2" stroke="black" points="2994.56,-624.3 2994.56,-757.9 3217.78,-757.9 3217.78,-624.3 2994.56,-624.3"/>
-<text text-anchor="middle" x="3106.17" y="-741.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="3106.17" y="-724.5" font-family="Times,serif" font-size="14.00">EIP712Domain</text>
-<text text-anchor="middle" x="3106.17" y="-707.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="2994.56,-699.5 3217.78,-699.5 "/>
-<text text-anchor="start" x="3002.56" y="-682.9" font-family="Times,serif" font-size="14.00">name: string</text>
-<text text-anchor="start" x="3002.56" y="-666.1" font-family="Times,serif" font-size="14.00">version: string</text>
-<text text-anchor="start" x="3002.56" y="-649.3" font-family="Times,serif" font-size="14.00">chainId: uint256</text>
-<text text-anchor="start" x="3002.56" y="-632.5" font-family="Times,serif" font-size="14.00">verifyingContract: address</text>
-</g>
-<!-- 14&#45;&gt;16 -->
-<g id="edge27" class="edge">
-<title>14&#45;&gt;16</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3616.35,-251.27C3489.44,-286.87 3333.09,-347.75 3223.17,-447.4 3173.58,-492.35 3140.4,-561.4 3122.09,-614.36"/>
-<polygon fill="black" stroke="black" points="3118.7,-613.46 3118.85,-624.06 3125.34,-615.69 3118.7,-613.46"/>
-</g>
-<!-- 17 -->
-<g id="node18" class="node">
-<title>17</title>
-<polygon fill="#f2f2f2" stroke="black" points="3143.56,-1030.1 3143.56,-1247.7 3366.78,-1247.7 3366.78,-1030.1 3143.56,-1030.1"/>
-<text text-anchor="middle" x="3255.17" y="-1231.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="3255.17" y="-1214.3" font-family="Times,serif" font-size="14.00">AppOrder</text>
-<text text-anchor="middle" x="3255.17" y="-1197.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="3143.56,-1189.3 3366.78,-1189.3 "/>
-<text text-anchor="start" x="3151.56" y="-1172.7" font-family="Times,serif" font-size="14.00">app: address</text>
-<text text-anchor="start" x="3151.56" y="-1155.9" font-family="Times,serif" font-size="14.00">appprice: uint256</text>
-<text text-anchor="start" x="3151.56" y="-1139.1" font-family="Times,serif" font-size="14.00">volume: uint256</text>
-<text text-anchor="start" x="3151.56" y="-1122.3" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
-<text text-anchor="start" x="3151.56" y="-1105.5" font-family="Times,serif" font-size="14.00">datasetrestrict: address</text>
-<text text-anchor="start" x="3151.56" y="-1088.7" font-family="Times,serif" font-size="14.00">workerpoolrestrict: address</text>
-<text text-anchor="start" x="3151.56" y="-1071.9" font-family="Times,serif" font-size="14.00">requesterrestrict: address</text>
-<text text-anchor="start" x="3151.56" y="-1055.1" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
-<text text-anchor="start" x="3151.56" y="-1038.3" font-family="Times,serif" font-size="14.00">sign: bytes</text>
-</g>
-<!-- 14&#45;&gt;17 -->
-<g id="edge28" class="edge">
-<title>14&#45;&gt;17</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3616.18,-241.91C3494.23,-273.93 3351.42,-334.34 3274.17,-447.4 3212.7,-537.36 3224.36,-847.26 3239.54,-1019.72"/>
-<polygon fill="black" stroke="black" points="3236.07,-1020.21 3240.45,-1029.86 3243.04,-1019.58 3236.07,-1020.21"/>
+<polygon fill="#f2f2f2" stroke="black" points="4965.31,-0.5 4965.31,-410.9 5398.84,-410.9 5398.84,-0.5 4965.31,-0.5"/>
+<text text-anchor="middle" x="5182.08" y="-394.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
+<text text-anchor="middle" x="5182.08" y="-377.5" font-family="Times,serif" font-size="14.00">IexecLibOrders_v5</text>
+<text text-anchor="middle" x="5182.08" y="-360.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="4965.31,-352.5 5398.84,-352.5 "/>
+<text text-anchor="start" x="4973.31" y="-335.9" font-family="Times,serif" font-size="14.00">Public:</text>
+<text text-anchor="start" x="4973.31" y="-319.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;EIP712DOMAIN_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="4973.31" y="-302.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;APPORDER_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="4973.31" y="-285.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;DATASETORDER_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="4973.31" y="-268.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;WORKERPOOLORDER_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="4973.31" y="-251.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;REQUESTORDER_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="4973.31" y="-235.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;APPORDEROPERATION_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="4973.31" y="-218.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;DATASETORDEROPERATION_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="4973.31" y="-201.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;WORKERPOOLORDEROPERATION_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="4973.31" y="-184.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;REQUESTORDEROPERATION_TYPEHASH: bytes32</text>
+<polyline fill="none" stroke="black" points="4965.31,-176.5 5398.84,-176.5 "/>
+<text text-anchor="start" x="4973.31" y="-159.9" font-family="Times,serif" font-size="14.00">Public:</text>
+<text text-anchor="start" x="4973.31" y="-143.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_domain: EIP712Domain): (domainhash: bytes32)</text>
+<text text-anchor="start" x="4973.31" y="-126.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_apporder: AppOrder): (apphash: bytes32)</text>
+<text text-anchor="start" x="4973.31" y="-109.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_datasetorder: DatasetOrder): (datasethash: bytes32)</text>
+<text text-anchor="start" x="4973.31" y="-92.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_workerpoolorder: WorkerpoolOrder): (workerpoolhash: bytes32)</text>
+<text text-anchor="start" x="4973.31" y="-75.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_requestorder: RequestOrder): (requesthash: bytes32)</text>
+<text text-anchor="start" x="4973.31" y="-59.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_apporderoperation: AppOrderOperation): bytes32</text>
+<text text-anchor="start" x="4973.31" y="-42.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_datasetorderoperation: DatasetOrderOperation): bytes32</text>
+<text text-anchor="start" x="4973.31" y="-25.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_workerpoolorderoperation: WorkerpoolOrderOperation): bytes32</text>
+<text text-anchor="start" x="4973.31" y="-8.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_requestorderoperation: RequestOrderOperation): bytes32</text>
 </g>
 <!-- 18 -->
 <g id="node19" class="node">
 <title>18</title>
-<polygon fill="#f2f2f2" stroke="black" points="3721.56,-1030.1 3721.56,-1247.7 3944.78,-1247.7 3944.78,-1030.1 3721.56,-1030.1"/>
-<text text-anchor="middle" x="3833.17" y="-1231.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="3833.17" y="-1214.3" font-family="Times,serif" font-size="14.00">DatasetOrder</text>
-<text text-anchor="middle" x="3833.17" y="-1197.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="3721.56,-1189.3 3944.78,-1189.3 "/>
-<text text-anchor="start" x="3729.56" y="-1172.7" font-family="Times,serif" font-size="14.00">dataset: address</text>
-<text text-anchor="start" x="3729.56" y="-1155.9" font-family="Times,serif" font-size="14.00">datasetprice: uint256</text>
-<text text-anchor="start" x="3729.56" y="-1139.1" font-family="Times,serif" font-size="14.00">volume: uint256</text>
-<text text-anchor="start" x="3729.56" y="-1122.3" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
-<text text-anchor="start" x="3729.56" y="-1105.5" font-family="Times,serif" font-size="14.00">apprestrict: address</text>
-<text text-anchor="start" x="3729.56" y="-1088.7" font-family="Times,serif" font-size="14.00">workerpoolrestrict: address</text>
-<text text-anchor="start" x="3729.56" y="-1071.9" font-family="Times,serif" font-size="14.00">requesterrestrict: address</text>
-<text text-anchor="start" x="3729.56" y="-1055.1" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
-<text text-anchor="start" x="3729.56" y="-1038.3" font-family="Times,serif" font-size="14.00">sign: bytes</text>
-</g>
-<!-- 14&#45;&gt;18 -->
-<g id="edge29" class="edge">
-<title>14&#45;&gt;18</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3827.47,-411.06C3825.78,-597.5 3826.12,-866.58 3828.49,-1019.63"/>
-<polygon fill="black" stroke="black" points="3825,-1020.05 3828.66,-1029.99 3831.99,-1019.93 3825,-1020.05"/>
+<polygon fill="#f2f2f2" stroke="black" points="4343.47,-548.7 4343.47,-682.3 4566.69,-682.3 4566.69,-548.7 4343.47,-548.7"/>
+<text text-anchor="middle" x="4455.08" y="-665.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="4455.08" y="-648.9" font-family="Times,serif" font-size="14.00">EIP712Domain</text>
+<text text-anchor="middle" x="4455.08" y="-632.1" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="4343.47,-623.9 4566.69,-623.9 "/>
+<text text-anchor="start" x="4351.47" y="-607.3" font-family="Times,serif" font-size="14.00">name: string</text>
+<text text-anchor="start" x="4351.47" y="-590.5" font-family="Times,serif" font-size="14.00">version: string</text>
+<text text-anchor="start" x="4351.47" y="-573.7" font-family="Times,serif" font-size="14.00">chainId: uint256</text>
+<text text-anchor="start" x="4351.47" y="-556.9" font-family="Times,serif" font-size="14.00">verifyingContract: address</text>
+</g>
+<!-- 16&#45;&gt;18 -->
+<g id="edge31" class="edge">
+<title>16&#45;&gt;18</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4965.15,-259.73C4841.32,-297.96 4688.15,-358.64 4572.08,-447.4 4539.36,-472.42 4510.91,-508.05 4490.14,-539.99"/>
+<polygon fill="black" stroke="black" points="4487.17,-538.13 4484.76,-548.45 4493.08,-541.89 4487.17,-538.13"/>
 </g>
 <!-- 19 -->
 <g id="node20" class="node">
 <title>19</title>
-<polygon fill="#f2f2f2" stroke="black" points="4019.56,-1013.3 4019.56,-1264.5 4242.78,-1264.5 4242.78,-1013.3 4019.56,-1013.3"/>
-<text text-anchor="middle" x="4131.17" y="-1247.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="4131.17" y="-1231.1" font-family="Times,serif" font-size="14.00">WorkerpoolOrder</text>
-<text text-anchor="middle" x="4131.17" y="-1214.3" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="4019.56,-1206.1 4242.78,-1206.1 "/>
-<text text-anchor="start" x="4027.56" y="-1189.5" font-family="Times,serif" font-size="14.00">workerpool: address</text>
-<text text-anchor="start" x="4027.56" y="-1172.7" font-family="Times,serif" font-size="14.00">workerpoolprice: uint256</text>
-<text text-anchor="start" x="4027.56" y="-1155.9" font-family="Times,serif" font-size="14.00">volume: uint256</text>
-<text text-anchor="start" x="4027.56" y="-1139.1" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
-<text text-anchor="start" x="4027.56" y="-1122.3" font-family="Times,serif" font-size="14.00">category: uint256</text>
-<text text-anchor="start" x="4027.56" y="-1105.5" font-family="Times,serif" font-size="14.00">trust: uint256</text>
-<text text-anchor="start" x="4027.56" y="-1088.7" font-family="Times,serif" font-size="14.00">apprestrict: address</text>
-<text text-anchor="start" x="4027.56" y="-1071.9" font-family="Times,serif" font-size="14.00">datasetrestrict: address</text>
-<text text-anchor="start" x="4027.56" y="-1055.1" font-family="Times,serif" font-size="14.00">requesterrestrict: address</text>
-<text text-anchor="start" x="4027.56" y="-1038.3" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
-<text text-anchor="start" x="4027.56" y="-1021.5" font-family="Times,serif" font-size="14.00">sign: bytes</text>
-</g>
-<!-- 14&#45;&gt;19 -->
-<g id="edge30" class="edge">
-<title>14&#45;&gt;19</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4049.95,-378.61C4067.34,-399.99 4082.63,-422.99 4094.17,-447.4 4139.04,-542.32 4135.64,-830.18 4131.88,-1002.81"/>
-<polygon fill="black" stroke="black" points="4128.38,-1002.91 4131.66,-1012.98 4135.38,-1003.06 4128.38,-1002.91"/>
+<polygon fill="#f2f2f2" stroke="black" points="4492.47,-954.5 4492.47,-1172.1 4715.69,-1172.1 4715.69,-954.5 4492.47,-954.5"/>
+<text text-anchor="middle" x="4604.08" y="-1155.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="4604.08" y="-1138.7" font-family="Times,serif" font-size="14.00">AppOrder</text>
+<text text-anchor="middle" x="4604.08" y="-1121.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="4492.47,-1113.7 4715.69,-1113.7 "/>
+<text text-anchor="start" x="4500.47" y="-1097.1" font-family="Times,serif" font-size="14.00">app: address</text>
+<text text-anchor="start" x="4500.47" y="-1080.3" font-family="Times,serif" font-size="14.00">appprice: uint256</text>
+<text text-anchor="start" x="4500.47" y="-1063.5" font-family="Times,serif" font-size="14.00">volume: uint256</text>
+<text text-anchor="start" x="4500.47" y="-1046.7" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
+<text text-anchor="start" x="4500.47" y="-1029.9" font-family="Times,serif" font-size="14.00">datasetrestrict: address</text>
+<text text-anchor="start" x="4500.47" y="-1013.1" font-family="Times,serif" font-size="14.00">workerpoolrestrict: address</text>
+<text text-anchor="start" x="4500.47" y="-996.3" font-family="Times,serif" font-size="14.00">requesterrestrict: address</text>
+<text text-anchor="start" x="4500.47" y="-979.5" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
+<text text-anchor="start" x="4500.47" y="-962.7" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+</g>
+<!-- 16&#45;&gt;19 -->
+<g id="edge32" class="edge">
+<title>16&#45;&gt;19</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4965.29,-242.04C4843.41,-274.12 4700.61,-334.53 4623.08,-447.4 4569.61,-525.24 4576.62,-788.7 4589.05,-944.37"/>
+<polygon fill="black" stroke="black" points="4585.58,-944.78 4589.88,-954.46 4592.55,-944.21 4585.58,-944.78"/>
 </g>
 <!-- 20 -->
 <g id="node21" class="node">
 <title>20</title>
-<polygon fill="#f2f2f2" stroke="black" points="4317.56,-971.3 4317.56,-1306.5 4540.78,-1306.5 4540.78,-971.3 4317.56,-971.3"/>
-<text text-anchor="middle" x="4429.17" y="-1289.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="4429.17" y="-1273.1" font-family="Times,serif" font-size="14.00">RequestOrder</text>
-<text text-anchor="middle" x="4429.17" y="-1256.3" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="4317.56,-1248.1 4540.78,-1248.1 "/>
-<text text-anchor="start" x="4325.56" y="-1231.5" font-family="Times,serif" font-size="14.00">app: address</text>
-<text text-anchor="start" x="4325.56" y="-1214.7" font-family="Times,serif" font-size="14.00">appmaxprice: uint256</text>
-<text text-anchor="start" x="4325.56" y="-1197.9" font-family="Times,serif" font-size="14.00">dataset: address</text>
-<text text-anchor="start" x="4325.56" y="-1181.1" font-family="Times,serif" font-size="14.00">datasetmaxprice: uint256</text>
-<text text-anchor="start" x="4325.56" y="-1164.3" font-family="Times,serif" font-size="14.00">workerpool: address</text>
-<text text-anchor="start" x="4325.56" y="-1147.5" font-family="Times,serif" font-size="14.00">workerpoolmaxprice: uint256</text>
-<text text-anchor="start" x="4325.56" y="-1130.7" font-family="Times,serif" font-size="14.00">requester: address</text>
-<text text-anchor="start" x="4325.56" y="-1113.9" font-family="Times,serif" font-size="14.00">volume: uint256</text>
-<text text-anchor="start" x="4325.56" y="-1097.1" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
-<text text-anchor="start" x="4325.56" y="-1080.3" font-family="Times,serif" font-size="14.00">category: uint256</text>
-<text text-anchor="start" x="4325.56" y="-1063.5" font-family="Times,serif" font-size="14.00">trust: uint256</text>
-<text text-anchor="start" x="4325.56" y="-1046.7" font-family="Times,serif" font-size="14.00">beneficiary: address</text>
-<text text-anchor="start" x="4325.56" y="-1029.9" font-family="Times,serif" font-size="14.00">callback: address</text>
-<text text-anchor="start" x="4325.56" y="-1013.1" font-family="Times,serif" font-size="14.00">params: string</text>
-<text text-anchor="start" x="4325.56" y="-996.3" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
-<text text-anchor="start" x="4325.56" y="-979.5" font-family="Times,serif" font-size="14.00">sign: bytes</text>
-</g>
-<!-- 14&#45;&gt;20 -->
-<g id="edge31" class="edge">
-<title>14&#45;&gt;20</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4050.08,-242.31C4171.61,-274.25 4314.02,-334.44 4392.17,-447.4 4495.43,-596.65 4486.43,-810.62 4463.64,-960.71"/>
-<polygon fill="black" stroke="black" points="4460.13,-960.53 4462.05,-970.95 4467.05,-961.61 4460.13,-960.53"/>
+<polygon fill="#f2f2f2" stroke="black" points="5070.47,-954.5 5070.47,-1172.1 5293.69,-1172.1 5293.69,-954.5 5070.47,-954.5"/>
+<text text-anchor="middle" x="5182.08" y="-1155.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="5182.08" y="-1138.7" font-family="Times,serif" font-size="14.00">DatasetOrder</text>
+<text text-anchor="middle" x="5182.08" y="-1121.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="5070.47,-1113.7 5293.69,-1113.7 "/>
+<text text-anchor="start" x="5078.47" y="-1097.1" font-family="Times,serif" font-size="14.00">dataset: address</text>
+<text text-anchor="start" x="5078.47" y="-1080.3" font-family="Times,serif" font-size="14.00">datasetprice: uint256</text>
+<text text-anchor="start" x="5078.47" y="-1063.5" font-family="Times,serif" font-size="14.00">volume: uint256</text>
+<text text-anchor="start" x="5078.47" y="-1046.7" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
+<text text-anchor="start" x="5078.47" y="-1029.9" font-family="Times,serif" font-size="14.00">apprestrict: address</text>
+<text text-anchor="start" x="5078.47" y="-1013.1" font-family="Times,serif" font-size="14.00">workerpoolrestrict: address</text>
+<text text-anchor="start" x="5078.47" y="-996.3" font-family="Times,serif" font-size="14.00">requesterrestrict: address</text>
+<text text-anchor="start" x="5078.47" y="-979.5" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
+<text text-anchor="start" x="5078.47" y="-962.7" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+</g>
+<!-- 16&#45;&gt;20 -->
+<g id="edge33" class="edge">
+<title>16&#45;&gt;20</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5176.22,-411.09C5174.75,-577.59 5175.09,-806.85 5177.25,-944.24"/>
+<polygon fill="black" stroke="black" points="5173.75,-944.44 5177.41,-954.38 5180.75,-944.32 5173.75,-944.44"/>
 </g>
 <!-- 21 -->
 <g id="node22" class="node">
 <title>21</title>
-<polygon fill="#f2f2f2" stroke="black" points="3292.56,-632.7 3292.56,-749.5 3515.78,-749.5 3515.78,-632.7 3292.56,-632.7"/>
-<text text-anchor="middle" x="3404.17" y="-732.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="3404.17" y="-716.1" font-family="Times,serif" font-size="14.00">AppOrderOperation</text>
-<text text-anchor="middle" x="3404.17" y="-699.3" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="3292.56,-691.1 3515.78,-691.1 "/>
-<text text-anchor="start" x="3300.56" y="-674.5" font-family="Times,serif" font-size="14.00">order: AppOrder</text>
-<text text-anchor="start" x="3300.56" y="-657.7" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
-<text text-anchor="start" x="3300.56" y="-640.9" font-family="Times,serif" font-size="14.00">sign: bytes</text>
-</g>
-<!-- 14&#45;&gt;21 -->
-<g id="edge32" class="edge">
-<title>14&#45;&gt;21</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3616.37,-352.45C3582.14,-381.59 3548.94,-413.7 3521.17,-447.4 3477.26,-500.69 3442.57,-571.77 3422.45,-623.22"/>
-<polygon fill="black" stroke="black" points="3419.17,-622 3418.86,-632.59 3425.71,-624.51 3419.17,-622"/>
+<polygon fill="#f2f2f2" stroke="black" points="5368.47,-937.7 5368.47,-1188.9 5591.69,-1188.9 5591.69,-937.7 5368.47,-937.7"/>
+<text text-anchor="middle" x="5480.08" y="-1172.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="5480.08" y="-1155.5" font-family="Times,serif" font-size="14.00">WorkerpoolOrder</text>
+<text text-anchor="middle" x="5480.08" y="-1138.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="5368.47,-1130.5 5591.69,-1130.5 "/>
+<text text-anchor="start" x="5376.47" y="-1113.9" font-family="Times,serif" font-size="14.00">workerpool: address</text>
+<text text-anchor="start" x="5376.47" y="-1097.1" font-family="Times,serif" font-size="14.00">workerpoolprice: uint256</text>
+<text text-anchor="start" x="5376.47" y="-1080.3" font-family="Times,serif" font-size="14.00">volume: uint256</text>
+<text text-anchor="start" x="5376.47" y="-1063.5" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
+<text text-anchor="start" x="5376.47" y="-1046.7" font-family="Times,serif" font-size="14.00">category: uint256</text>
+<text text-anchor="start" x="5376.47" y="-1029.9" font-family="Times,serif" font-size="14.00">trust: uint256</text>
+<text text-anchor="start" x="5376.47" y="-1013.1" font-family="Times,serif" font-size="14.00">apprestrict: address</text>
+<text text-anchor="start" x="5376.47" y="-996.3" font-family="Times,serif" font-size="14.00">datasetrestrict: address</text>
+<text text-anchor="start" x="5376.47" y="-979.5" font-family="Times,serif" font-size="14.00">requesterrestrict: address</text>
+<text text-anchor="start" x="5376.47" y="-962.7" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
+<text text-anchor="start" x="5376.47" y="-945.9" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+</g>
+<!-- 16&#45;&gt;21 -->
+<g id="edge34" class="edge">
+<title>16&#45;&gt;21</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5399.04,-379.04C5416.33,-400.3 5431.54,-423.16 5443.08,-447.4 5482.02,-529.25 5481.65,-772.66 5479.58,-927.56"/>
+<polygon fill="black" stroke="black" points="5476.08,-927.58 5479.44,-937.63 5483.08,-927.68 5476.08,-927.58"/>
 </g>
 <!-- 22 -->
 <g id="node23" class="node">
 <title>22</title>
-<polygon fill="#f2f2f2" stroke="black" points="3572.56,-632.7 3572.56,-749.5 3795.78,-749.5 3795.78,-632.7 3572.56,-632.7"/>
-<text text-anchor="middle" x="3684.17" y="-732.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="3684.17" y="-716.1" font-family="Times,serif" font-size="14.00">DatasetOrderOperation</text>
-<text text-anchor="middle" x="3684.17" y="-699.3" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="3572.56,-691.1 3795.78,-691.1 "/>
-<text text-anchor="start" x="3580.56" y="-674.5" font-family="Times,serif" font-size="14.00">order: DatasetOrder</text>
-<text text-anchor="start" x="3580.56" y="-657.7" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
-<text text-anchor="start" x="3580.56" y="-640.9" font-family="Times,serif" font-size="14.00">sign: bytes</text>
-</g>
-<!-- 14&#45;&gt;22 -->
-<g id="edge33" class="edge">
-<title>14&#45;&gt;22</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3763.52,-411C3739.86,-486.81 3715.55,-567.65 3700.09,-622.7"/>
-<polygon fill="black" stroke="black" points="3696.62,-622.1 3697.31,-632.68 3703.37,-623.98 3696.62,-622.1"/>
+<polygon fill="#f2f2f2" stroke="black" points="5666.47,-895.7 5666.47,-1230.9 5889.69,-1230.9 5889.69,-895.7 5666.47,-895.7"/>
+<text text-anchor="middle" x="5778.08" y="-1214.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="5778.08" y="-1197.5" font-family="Times,serif" font-size="14.00">RequestOrder</text>
+<text text-anchor="middle" x="5778.08" y="-1180.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="5666.47,-1172.5 5889.69,-1172.5 "/>
+<text text-anchor="start" x="5674.47" y="-1155.9" font-family="Times,serif" font-size="14.00">app: address</text>
+<text text-anchor="start" x="5674.47" y="-1139.1" font-family="Times,serif" font-size="14.00">appmaxprice: uint256</text>
+<text text-anchor="start" x="5674.47" y="-1122.3" font-family="Times,serif" font-size="14.00">dataset: address</text>
+<text text-anchor="start" x="5674.47" y="-1105.5" font-family="Times,serif" font-size="14.00">datasetmaxprice: uint256</text>
+<text text-anchor="start" x="5674.47" y="-1088.7" font-family="Times,serif" font-size="14.00">workerpool: address</text>
+<text text-anchor="start" x="5674.47" y="-1071.9" font-family="Times,serif" font-size="14.00">workerpoolmaxprice: uint256</text>
+<text text-anchor="start" x="5674.47" y="-1055.1" font-family="Times,serif" font-size="14.00">requester: address</text>
+<text text-anchor="start" x="5674.47" y="-1038.3" font-family="Times,serif" font-size="14.00">volume: uint256</text>
+<text text-anchor="start" x="5674.47" y="-1021.5" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
+<text text-anchor="start" x="5674.47" y="-1004.7" font-family="Times,serif" font-size="14.00">category: uint256</text>
+<text text-anchor="start" x="5674.47" y="-987.9" font-family="Times,serif" font-size="14.00">trust: uint256</text>
+<text text-anchor="start" x="5674.47" y="-971.1" font-family="Times,serif" font-size="14.00">beneficiary: address</text>
+<text text-anchor="start" x="5674.47" y="-954.3" font-family="Times,serif" font-size="14.00">callback: address</text>
+<text text-anchor="start" x="5674.47" y="-937.5" font-family="Times,serif" font-size="14.00">params: string</text>
+<text text-anchor="start" x="5674.47" y="-920.7" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
+<text text-anchor="start" x="5674.47" y="-903.9" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+</g>
+<!-- 16&#45;&gt;22 -->
+<g id="edge35" class="edge">
+<title>16&#45;&gt;22</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5399.14,-242.55C5520.52,-274.57 5662.72,-334.75 5741.08,-447.4 5829.1,-573.94 5826.82,-753.1 5809.66,-885.4"/>
+<polygon fill="black" stroke="black" points="5806.15,-885.27 5808.29,-895.65 5813.09,-886.2 5806.15,-885.27"/>
 </g>
 <!-- 23 -->
 <g id="node24" class="node">
 <title>23</title>
-<polygon fill="#f2f2f2" stroke="black" points="3870.56,-632.7 3870.56,-749.5 4093.78,-749.5 4093.78,-632.7 3870.56,-632.7"/>
-<text text-anchor="middle" x="3982.17" y="-732.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="3982.17" y="-716.1" font-family="Times,serif" font-size="14.00">WorkerpoolOrderOperation</text>
-<text text-anchor="middle" x="3982.17" y="-699.3" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="3870.56,-691.1 4093.78,-691.1 "/>
-<text text-anchor="start" x="3878.56" y="-674.5" font-family="Times,serif" font-size="14.00">order: WorkerpoolOrder</text>
-<text text-anchor="start" x="3878.56" y="-657.7" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
-<text text-anchor="start" x="3878.56" y="-640.9" font-family="Times,serif" font-size="14.00">sign: bytes</text>
-</g>
-<!-- 14&#45;&gt;23 -->
-<g id="edge34" class="edge">
-<title>14&#45;&gt;23</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3889.46,-411C3912.58,-486.97 3938.17,-567.98 3956.66,-623.05"/>
-<polygon fill="black" stroke="black" points="3953.4,-624.32 3959.91,-632.68 3960.03,-622.08 3953.4,-624.32"/>
+<polygon fill="#f2f2f2" stroke="black" points="4641.47,-557.1 4641.47,-673.9 4864.69,-673.9 4864.69,-557.1 4641.47,-557.1"/>
+<text text-anchor="middle" x="4753.08" y="-657.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="4753.08" y="-640.5" font-family="Times,serif" font-size="14.00">AppOrderOperation</text>
+<text text-anchor="middle" x="4753.08" y="-623.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="4641.47,-615.5 4864.69,-615.5 "/>
+<text text-anchor="start" x="4649.47" y="-598.9" font-family="Times,serif" font-size="14.00">order: AppOrder</text>
+<text text-anchor="start" x="4649.47" y="-582.1" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
+<text text-anchor="start" x="4649.47" y="-565.3" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+</g>
+<!-- 16&#45;&gt;23 -->
+<g id="edge36" class="edge">
+<title>16&#45;&gt;23</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4965.01,-360.5C4931.92,-388.08 4899.16,-417.58 4870.08,-447.4 4839.92,-478.32 4810.61,-516.56 4788.75,-548.65"/>
+<polygon fill="black" stroke="black" points="4785.75,-546.84 4783.07,-557.1 4791.56,-550.75 4785.75,-546.84"/>
 </g>
 <!-- 24 -->
 <g id="node25" class="node">
 <title>24</title>
-<polygon fill="#f2f2f2" stroke="black" points="4168.56,-632.7 4168.56,-749.5 4391.78,-749.5 4391.78,-632.7 4168.56,-632.7"/>
-<text text-anchor="middle" x="4280.17" y="-732.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="4280.17" y="-716.1" font-family="Times,serif" font-size="14.00">RequestOrderOperation</text>
-<text text-anchor="middle" x="4280.17" y="-699.3" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="4168.56,-691.1 4391.78,-691.1 "/>
-<text text-anchor="start" x="4176.56" y="-674.5" font-family="Times,serif" font-size="14.00">order: RequestOrder</text>
-<text text-anchor="start" x="4176.56" y="-657.7" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
-<text text-anchor="start" x="4176.56" y="-640.9" font-family="Times,serif" font-size="14.00">sign: bytes</text>
-</g>
-<!-- 14&#45;&gt;24 -->
-<g id="edge35" class="edge">
-<title>14&#45;&gt;24</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4050.23,-355.47C4084.28,-383.6 4117.36,-414.59 4145.17,-447.4 4189.89,-500.16 4224.52,-571.47 4247.71,-623.13"/>
-<polygon fill="black" stroke="black" points="4244.64,-624.83 4251.91,-632.54 4251.03,-621.98 4244.64,-624.83"/>
-</g>
-<!-- 15 -->
-<g id="node16" class="node">
-<title>15</title>
-<polygon fill="#f2f2f2" stroke="black" points="3456.56,-1088.9 3456.56,-1188.9 3679.78,-1188.9 3679.78,-1088.9 3456.56,-1088.9"/>
-<text text-anchor="middle" x="3568.17" y="-1172.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Enum&gt;&gt;</text>
-<text text-anchor="middle" x="3568.17" y="-1155.5" font-family="Times,serif" font-size="14.00">OrderOperationEnum</text>
-<text text-anchor="middle" x="3568.17" y="-1138.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="3456.56,-1130.5 3679.78,-1130.5 "/>
-<text text-anchor="start" x="3464.56" y="-1113.9" font-family="Times,serif" font-size="14.00">SIGN: 0</text>
-<text text-anchor="start" x="3464.56" y="-1097.1" font-family="Times,serif" font-size="14.00">CLOSE: 1</text>
-</g>
-<!-- 15&#45;&gt;14 -->
-<g id="edge17" class="edge">
-<title>15&#45;&gt;14</title>
-<path fill="none" stroke="black" d="M3562.6,-1088.68C3547.77,-950.54 3511.87,-561.86 3563.17,-447.4 3574.63,-421.83 3590.3,-397.86 3608.36,-375.71"/>
-<polygon fill="black" stroke="black" points="3608.52,-375.51 3609.32,-368.35 3616.24,-366.32 3615.45,-373.49 3608.52,-375.51"/>
-</g>
-<!-- 16&#45;&gt;14 -->
-<g id="edge18" class="edge">
-<title>16&#45;&gt;14</title>
-<path fill="none" stroke="black" d="M3133.24,-624.06C3154.33,-570.08 3188.5,-495.15 3241.17,-447.4 3343.11,-354.98 3485,-295.91 3604.32,-259.42"/>
-<polygon fill="black" stroke="black" points="3604.68,-259.32 3609.27,-253.76 3616.17,-255.85 3611.58,-261.42 3604.68,-259.32"/>
+<polygon fill="#f2f2f2" stroke="black" points="4921.47,-557.1 4921.47,-673.9 5144.69,-673.9 5144.69,-557.1 4921.47,-557.1"/>
+<text text-anchor="middle" x="5033.08" y="-657.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="5033.08" y="-640.5" font-family="Times,serif" font-size="14.00">DatasetOrderOperation</text>
+<text text-anchor="middle" x="5033.08" y="-623.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="4921.47,-615.5 5144.69,-615.5 "/>
+<text text-anchor="start" x="4929.47" y="-598.9" font-family="Times,serif" font-size="14.00">order: DatasetOrder</text>
+<text text-anchor="start" x="4929.47" y="-582.1" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
+<text text-anchor="start" x="4929.47" y="-565.3" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+</g>
+<!-- 16&#45;&gt;24 -->
+<g id="edge37" class="edge">
+<title>16&#45;&gt;24</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5100.61,-411.2C5082.68,-460.27 5065.3,-509.3 5052.6,-546.91"/>
+<polygon fill="black" stroke="black" points="5049.18,-546.12 5049.31,-556.71 5055.81,-548.34 5049.18,-546.12"/>
 </g>
-<!-- 17&#45;&gt;14 -->
-<g id="edge19" class="edge">
-<title>17&#45;&gt;14</title>
-<path fill="none" stroke="black" d="M3251.63,-1029.86C3242.85,-859.69 3229.47,-539.16 3292.17,-447.4 3363.65,-342.77 3491.29,-283.24 3604.65,-249.56"/>
-<polygon fill="black" stroke="black" points="3604.75,-249.53 3609.4,-244.01 3616.27,-246.18 3611.63,-251.69 3604.75,-249.53"/>
+<!-- 25 -->
+<g id="node26" class="node">
+<title>25</title>
+<polygon fill="#f2f2f2" stroke="black" points="5219.47,-557.1 5219.47,-673.9 5442.69,-673.9 5442.69,-557.1 5219.47,-557.1"/>
+<text text-anchor="middle" x="5331.08" y="-657.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="5331.08" y="-640.5" font-family="Times,serif" font-size="14.00">WorkerpoolOrderOperation</text>
+<text text-anchor="middle" x="5331.08" y="-623.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="5219.47,-615.5 5442.69,-615.5 "/>
+<text text-anchor="start" x="5227.47" y="-598.9" font-family="Times,serif" font-size="14.00">order: WorkerpoolOrder</text>
+<text text-anchor="start" x="5227.47" y="-582.1" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
+<text text-anchor="start" x="5227.47" y="-565.3" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+</g>
+<!-- 16&#45;&gt;25 -->
+<g id="edge38" class="edge">
+<title>16&#45;&gt;25</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5250.05,-411.2C5268.06,-460.48 5286.58,-509.72 5301.4,-547.39"/>
+<polygon fill="black" stroke="black" points="5298.15,-548.7 5305.08,-556.71 5304.66,-546.12 5298.15,-548.7"/>
 </g>
-<!-- 18&#45;&gt;14 -->
-<g id="edge20" class="edge">
-<title>18&#45;&gt;14</title>
-<path fill="none" stroke="black" d="M3837.68,-1029.99C3840.14,-882.16 3840.57,-613.37 3838.97,-423.18"/>
-<polygon fill="black" stroke="black" points="3838.97,-423.06 3834.92,-417.09 3838.87,-411.06 3842.92,-417.02 3838.97,-423.06"/>
+<!-- 26 -->
+<g id="node27" class="node">
+<title>26</title>
+<polygon fill="#f2f2f2" stroke="black" points="5517.47,-557.1 5517.47,-673.9 5740.69,-673.9 5740.69,-557.1 5517.47,-557.1"/>
+<text text-anchor="middle" x="5629.08" y="-657.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="5629.08" y="-640.5" font-family="Times,serif" font-size="14.00">RequestOrderOperation</text>
+<text text-anchor="middle" x="5629.08" y="-623.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="5517.47,-615.5 5740.69,-615.5 "/>
+<text text-anchor="start" x="5525.47" y="-598.9" font-family="Times,serif" font-size="14.00">order: RequestOrder</text>
+<text text-anchor="start" x="5525.47" y="-582.1" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
+<text text-anchor="start" x="5525.47" y="-565.3" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+</g>
+<!-- 16&#45;&gt;26 -->
+<g id="edge39" class="edge">
+<title>16&#45;&gt;26</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5399.2,-363.38C5432.24,-389.95 5464.98,-418.38 5494.08,-447.4 5524.66,-477.9 5554.01,-516.11 5577.58,-548.29"/>
+<polygon fill="black" stroke="black" points="5575.04,-550.74 5583.75,-556.76 5580.69,-546.61 5575.04,-550.74"/>
 </g>
-<!-- 19&#45;&gt;14 -->
+<!-- 17 -->
+<g id="node18" class="node">
+<title>17</title>
+<polygon fill="#f2f2f2" stroke="black" points="4805.47,-1013.3 4805.47,-1113.3 5028.69,-1113.3 5028.69,-1013.3 4805.47,-1013.3"/>
+<text text-anchor="middle" x="4917.08" y="-1096.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Enum&gt;&gt;</text>
+<text text-anchor="middle" x="4917.08" y="-1079.9" font-family="Times,serif" font-size="14.00">OrderOperationEnum</text>
+<text text-anchor="middle" x="4917.08" y="-1063.1" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="4805.47,-1054.9 5028.69,-1054.9 "/>
+<text text-anchor="start" x="4813.47" y="-1038.3" font-family="Times,serif" font-size="14.00">SIGN: 0</text>
+<text text-anchor="start" x="4813.47" y="-1021.5" font-family="Times,serif" font-size="14.00">CLOSE: 1</text>
+</g>
+<!-- 17&#45;&gt;16 -->
 <g id="edge21" class="edge">
-<title>19&#45;&gt;14</title>
-<path fill="none" stroke="black" d="M4143.55,-1012.98C4153.49,-841.72 4157.93,-544.21 4112.17,-447.4 4098.54,-418.58 4079.7,-391.72 4058.18,-367.19"/>
-<polygon fill="black" stroke="black" points="4058.17,-367.17 4051.18,-365.39 4050.14,-358.25 4057.13,-360.03 4058.17,-367.17"/>
+<title>17&#45;&gt;16</title>
+<path fill="none" stroke="black" d="M4911.48,-1013.04C4897.82,-885.58 4867.05,-547.86 4912.08,-447.4 4923.54,-421.83 4939.21,-397.86 4957.27,-375.71"/>
+<polygon fill="black" stroke="black" points="4957.44,-375.51 4958.23,-368.35 4965.15,-366.32 4964.36,-373.49 4957.44,-375.51"/>
 </g>
-<!-- 20&#45;&gt;14 -->
+<!-- 18&#45;&gt;16 -->
 <g id="edge22" class="edge">
-<title>20&#45;&gt;14</title>
-<path fill="none" stroke="black" d="M4476.08,-970.95C4503.96,-820.49 4515.8,-600.08 4410.17,-447.4 4331.21,-333.28 4186.68,-273.02 4062,-241.33"/>
-<polygon fill="black" stroke="black" points="4061.65,-241.25 4054.86,-243.68 4050,-238.36 4056.79,-235.92 4061.65,-241.25"/>
+<title>18&#45;&gt;16</title>
+<path fill="none" stroke="black" d="M4500.74,-548.45C4523.86,-514.5 4554.43,-474.66 4590.08,-447.4 4697.66,-365.14 4837.1,-306.99 4953.65,-268.48"/>
+<polygon fill="black" stroke="black" points="4953.81,-268.43 4958.27,-262.76 4965.21,-264.7 4960.75,-270.37 4953.81,-268.43"/>
 </g>
-<!-- 21&#45;&gt;14 -->
+<!-- 19&#45;&gt;16 -->
 <g id="edge23" class="edge">
-<title>21&#45;&gt;14</title>
-<path fill="none" stroke="black" d="M3432.91,-632.59C3456.29,-580.69 3492.52,-504.01 3539.17,-447.4 3559.52,-422.69 3582.8,-398.85 3607.14,-376.39"/>
-<polygon fill="black" stroke="black" points="3607.28,-376.27 3609.03,-369.27 3616.16,-368.19 3614.41,-375.18 3607.28,-376.27"/>
-</g>
-<!-- 21&#45;&gt;15 -->
-<g id="edge37" class="edge">
-<title>21&#45;&gt;15</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3425.44,-749.92C3456.78,-835.11 3515.03,-993.46 3546.56,-1079.16"/>
-<polygon fill="black" stroke="black" points="3543.34,-1080.56 3550.08,-1088.74 3549.91,-1078.15 3543.34,-1080.56"/>
+<title>19&#45;&gt;16</title>
+<path fill="none" stroke="black" d="M4601.56,-954.46C4594.96,-800.36 4586.43,-526.95 4641.08,-447.4 4712.75,-343.05 4840.22,-283.54 4953.44,-249.81"/>
+<polygon fill="black" stroke="black" points="4953.53,-249.78 4958.17,-244.26 4965.05,-246.42 4960.41,-251.94 4953.53,-249.78"/>
 </g>
-<!-- 21&#45;&gt;17 -->
-<g id="edge36" class="edge">
-<title>21&#45;&gt;17</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3384.84,-749.92C3362.07,-818.05 3323.66,-932.97 3294.54,-1020.11"/>
-<polygon fill="black" stroke="black" points="3291.15,-1019.19 3291.3,-1029.78 3297.79,-1021.41 3291.15,-1019.19"/>
-</g>
-<!-- 22&#45;&gt;14 -->
+<!-- 20&#45;&gt;16 -->
 <g id="edge24" class="edge">
-<title>22&#45;&gt;14</title>
-<path fill="none" stroke="black" d="M3706.42,-632.68C3724.18,-580.41 3749.72,-499.87 3773.26,-422.84"/>
-<polygon fill="black" stroke="black" points="3773.37,-422.48 3771.3,-415.58 3776.87,-411 3778.95,-417.91 3773.37,-422.48"/>
+<title>20&#45;&gt;16</title>
+<path fill="none" stroke="black" d="M5186.74,-954.38C5188.99,-821.55 5189.42,-592.8 5188.04,-423.2"/>
+<polygon fill="black" stroke="black" points="5188.03,-423.09 5183.98,-417.13 5187.93,-411.09 5191.98,-417.06 5188.03,-423.09"/>
 </g>
-<!-- 22&#45;&gt;15 -->
-<g id="edge39" class="edge">
-<title>22&#45;&gt;15</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3669.12,-749.92C3646.98,-835.02 3605.84,-993.14 3583.52,-1078.9"/>
-<polygon fill="black" stroke="black" points="3580.09,-1078.18 3580.96,-1088.74 3586.87,-1079.94 3580.09,-1078.18"/>
+<!-- 21&#45;&gt;16 -->
+<g id="edge25" class="edge">
+<title>21&#45;&gt;16</title>
+<path fill="none" stroke="black" d="M5491.85,-937.63C5499.61,-783.43 5500.88,-531.05 5461.08,-447.4 5447.38,-418.61 5428.5,-391.78 5406.96,-367.25"/>
+<polygon fill="black" stroke="black" points="5406.94,-367.23 5399.95,-365.46 5398.9,-358.32 5405.89,-360.1 5406.94,-367.23"/>
 </g>
-<!-- 22&#45;&gt;18 -->
-<g id="edge38" class="edge">
-<title>22&#45;&gt;18</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3703.49,-749.92C3726.26,-818.05 3764.67,-932.97 3793.8,-1020.11"/>
-<polygon fill="black" stroke="black" points="3790.54,-1021.41 3797.03,-1029.78 3797.18,-1019.19 3790.54,-1021.41"/>
+<!-- 22&#45;&gt;16 -->
+<g id="edge26" class="edge">
+<title>22&#45;&gt;16</title>
+<path fill="none" stroke="black" d="M5822.81,-895.65C5844.64,-762.47 5849.39,-577.24 5759.08,-447.4 5679.91,-333.58 5535.58,-273.33 5411.05,-241.57"/>
+<polygon fill="black" stroke="black" points="5410.71,-241.48 5403.92,-243.91 5399.07,-238.58 5405.86,-236.15 5410.71,-241.48"/>
 </g>
-<!-- 23&#45;&gt;14 -->
-<g id="edge25" class="edge">
-<title>23&#45;&gt;14</title>
-<path fill="none" stroke="black" d="M3969.02,-632.68C3954.56,-580.41 3930.45,-499.87 3906.5,-422.84"/>
-<polygon fill="black" stroke="black" points="3906.39,-422.46 3900.78,-417.92 3902.82,-411 3908.42,-415.54 3906.39,-422.46"/>
+<!-- 23&#45;&gt;16 -->
+<g id="edge27" class="edge">
+<title>23&#45;&gt;16</title>
+<path fill="none" stroke="black" d="M4798.74,-557.1C4823.37,-523.45 4855.23,-481.09 4888.08,-447.4 4909.29,-425.65 4932.46,-404.07 4956.19,-383.28"/>
+<polygon fill="black" stroke="black" points="4956.25,-383.23 4958.16,-376.27 4965.31,-375.36 4963.4,-382.31 4956.25,-383.23"/>
 </g>
-<!-- 23&#45;&gt;15 -->
+<!-- 23&#45;&gt;17 -->
 <g id="edge41" class="edge">
-<title>23&#45;&gt;15</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3952.94,-749.5C3922.62,-803.92 3870.51,-884.61 3805.17,-934.8 3770.02,-961.8 3748.38,-945.25 3712.17,-970.8 3670.31,-1000.33 3632.87,-1044.63 3606.67,-1080.2"/>
-<polygon fill="black" stroke="black" points="3603.63,-1078.42 3600.59,-1088.57 3609.3,-1082.54 3603.63,-1078.42"/>
+<title>23&#45;&gt;17</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4774.35,-674.32C4805.69,-759.51 4863.94,-917.86 4895.47,-1003.56"/>
+<polygon fill="black" stroke="black" points="4892.26,-1004.96 4898.99,-1013.14 4898.82,-1002.55 4892.26,-1004.96"/>
 </g>
 <!-- 23&#45;&gt;19 -->
 <g id="edge40" class="edge">
 <title>23&#45;&gt;19</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4001.49,-749.92C4022.84,-813.78 4057.93,-918.76 4086.22,-1003.43"/>
-<polygon fill="black" stroke="black" points="4082.97,-1004.75 4089.46,-1013.12 4089.61,-1002.53 4082.97,-1004.75"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4733.75,-674.32C4710.98,-742.45 4672.57,-857.37 4643.45,-944.51"/>
+<polygon fill="black" stroke="black" points="4640.06,-943.59 4640.21,-954.18 4646.7,-945.81 4640.06,-943.59"/>
 </g>
-<!-- 24&#45;&gt;14 -->
-<g id="edge26" class="edge">
-<title>24&#45;&gt;14</title>
-<path fill="none" stroke="black" d="M4265.93,-632.54C4246.79,-580.42 4210.67,-503.44 4163.17,-447.4 4133.06,-411.89 4096.8,-378.51 4059.48,-348.58"/>
-<polygon fill="black" stroke="black" points="4059.38,-348.49 4052.19,-347.9 4049.98,-341.04 4057.16,-341.63 4059.38,-348.49"/>
+<!-- 24&#45;&gt;16 -->
+<g id="edge28" class="edge">
+<title>24&#45;&gt;16</title>
+<path fill="none" stroke="black" d="M5059.07,-556.71C5073.36,-520.78 5091.76,-472.09 5109.98,-422.47"/>
+<polygon fill="black" stroke="black" points="5109.98,-422.47 5108.29,-415.46 5114.11,-411.2 5115.8,-418.21 5109.98,-422.47"/>
 </g>
-<!-- 24&#45;&gt;15 -->
+<!-- 24&#45;&gt;17 -->
 <g id="edge43" class="edge">
-<title>24&#45;&gt;15</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4255.69,-749.64C4227.85,-807.25 4176.53,-893.16 4103.17,-934.8 3951.4,-1020.94 3867.31,-890.89 3712.17,-970.8 3664.85,-995.17 3626.46,-1042.34 3601.26,-1080.36"/>
-<polygon fill="black" stroke="black" points="3598.28,-1078.52 3595.77,-1088.82 3604.15,-1082.33 3598.28,-1078.52"/>
+<title>24&#45;&gt;17</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5018.03,-674.32C4995.89,-759.42 4954.75,-917.54 4932.43,-1003.3"/>
+<polygon fill="black" stroke="black" points="4929,-1002.58 4929.87,-1013.14 4935.78,-1004.34 4929,-1002.58"/>
 </g>
 <!-- 24&#45;&gt;20 -->
 <g id="edge42" class="edge">
 <title>24&#45;&gt;20</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4299.49,-749.92C4317.43,-803.58 4345.07,-886.28 4370.23,-961.55"/>
-<polygon fill="black" stroke="black" points="4366.95,-962.79 4373.44,-971.17 4373.59,-960.58 4366.95,-962.79"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5052.4,-674.32C5075.17,-742.45 5113.58,-857.37 5142.71,-944.51"/>
+<polygon fill="black" stroke="black" points="5139.45,-945.81 5145.94,-954.18 5146.09,-943.59 5139.45,-945.81"/>
 </g>
-<!-- 25 -->
-<g id="node26" class="node">
-<title>25</title>
-<polygon fill="#f2f2f2" stroke="black" points="2582.72,-1068.1 2582.72,-1209.7 2847.61,-1209.7 2847.61,-1068.1 2582.72,-1068.1"/>
-<text text-anchor="middle" x="2715.17" y="-1193.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
-<text text-anchor="middle" x="2715.17" y="-1176.3" font-family="Times,serif" font-size="14.00">PocoStorageLib</text>
-<text text-anchor="middle" x="2715.17" y="-1159.5" font-family="Times,serif" font-size="14.00">contracts/libs/PocoStorageLib.sol</text>
-<polyline fill="none" stroke="black" points="2582.72,-1151.3 2847.61,-1151.3 "/>
-<text text-anchor="start" x="2590.72" y="-1134.7" font-family="Times,serif" font-size="14.00">Private:</text>
-<text text-anchor="start" x="2590.72" y="-1117.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;POCO_STORAGE_LOCATION: bytes32</text>
-<polyline fill="none" stroke="black" points="2582.72,-1109.7 2847.61,-1109.7 "/>
-<text text-anchor="start" x="2590.72" y="-1093.1" font-family="Times,serif" font-size="14.00">Internal:</text>
-<text text-anchor="start" x="2590.72" y="-1076.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;getPocoStorage(): ($: PocoStorage)</text>
+<!-- 25&#45;&gt;16 -->
+<g id="edge29" class="edge">
+<title>25&#45;&gt;16</title>
+<path fill="none" stroke="black" d="M5314.84,-556.71C5302.89,-520.85 5285.77,-472.3 5267.77,-422.78"/>
+<polygon fill="black" stroke="black" points="5267.66,-422.47 5261.84,-418.2 5263.55,-411.2 5269.36,-415.46 5267.66,-422.47"/>
 </g>
-<!-- 26 -->
-<g id="node27" class="node">
-<title>26</title>
-<polygon fill="#f2f2f2" stroke="black" points="2454.2,-447.9 2454.2,-934.3 2976.13,-934.3 2976.13,-447.9 2454.2,-447.9"/>
-<text text-anchor="middle" x="2715.17" y="-917.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="2715.17" y="-900.9" font-family="Times,serif" font-size="14.00">PocoStorage</text>
-<text text-anchor="middle" x="2715.17" y="-884.1" font-family="Times,serif" font-size="14.00">contracts/libs/PocoStorageLib.sol</text>
-<polyline fill="none" stroke="black" points="2454.2,-875.9 2976.13,-875.9 "/>
-<text text-anchor="start" x="2462.2" y="-859.3" font-family="Times,serif" font-size="14.00">m_appregistry: IRegistry</text>
-<text text-anchor="start" x="2462.2" y="-842.5" font-family="Times,serif" font-size="14.00">m_datasetregistry: IRegistry</text>
-<text text-anchor="start" x="2462.2" y="-825.7" font-family="Times,serif" font-size="14.00">m_workerpoolregistry: IRegistry</text>
-<text text-anchor="start" x="2462.2" y="-808.9" font-family="Times,serif" font-size="14.00">m_baseToken: IERC20</text>
-<text text-anchor="start" x="2462.2" y="-792.1" font-family="Times,serif" font-size="14.00">m_name: string</text>
-<text text-anchor="start" x="2462.2" y="-775.3" font-family="Times,serif" font-size="14.00">m_symbol: string</text>
-<text text-anchor="start" x="2462.2" y="-758.5" font-family="Times,serif" font-size="14.00">m_decimals: uint8</text>
-<text text-anchor="start" x="2462.2" y="-741.7" font-family="Times,serif" font-size="14.00">m_totalSupply: uint256</text>
-<text text-anchor="start" x="2462.2" y="-724.9" font-family="Times,serif" font-size="14.00">m_balances: mapping(address=&gt;uint256)</text>
-<text text-anchor="start" x="2462.2" y="-708.1" font-family="Times,serif" font-size="14.00">m_frozens: mapping(address=&gt;uint256)</text>
-<text text-anchor="start" x="2462.2" y="-691.3" font-family="Times,serif" font-size="14.00">m_allowances: mapping(address=&gt;mapping(address=&gt;uint256))</text>
-<text text-anchor="start" x="2462.2" y="-674.5" font-family="Times,serif" font-size="14.00">m_eip712DomainSeparator: bytes32</text>
-<text text-anchor="start" x="2462.2" y="-657.7" font-family="Times,serif" font-size="14.00">m_presigned: mapping(bytes32=&gt;address)</text>
-<text text-anchor="start" x="2462.2" y="-640.9" font-family="Times,serif" font-size="14.00">m_consumed: mapping(bytes32=&gt;uint256)</text>
-<text text-anchor="start" x="2462.2" y="-624.1" font-family="Times,serif" font-size="14.00">m_deals: mapping(bytes32=&gt;IexecLibCore_v5.Deal)</text>
-<text text-anchor="start" x="2462.2" y="-607.3" font-family="Times,serif" font-size="14.00">m_tasks: mapping(bytes32=&gt;IexecLibCore_v5.Task)</text>
-<text text-anchor="start" x="2462.2" y="-590.5" font-family="Times,serif" font-size="14.00">m_consensus: mapping(bytes32=&gt;IexecLibCore_v5.Consensus)</text>
-<text text-anchor="start" x="2462.2" y="-573.7" font-family="Times,serif" font-size="14.00">m_contributions: mapping(bytes32=&gt;mapping(address=&gt;IexecLibCore_v5.Contribution))</text>
-<text text-anchor="start" x="2462.2" y="-556.9" font-family="Times,serif" font-size="14.00">m_workerScores: mapping(address=&gt;uint256)</text>
-<text text-anchor="start" x="2462.2" y="-540.1" font-family="Times,serif" font-size="14.00">m_teebroker: address</text>
-<text text-anchor="start" x="2462.2" y="-523.3" font-family="Times,serif" font-size="14.00">m_callbackgas: uint256</text>
-<text text-anchor="start" x="2462.2" y="-506.5" font-family="Times,serif" font-size="14.00">m_categories: IexecLibCore_v5.Category[]</text>
-<text text-anchor="start" x="2462.2" y="-489.7" font-family="Times,serif" font-size="14.00">m_v3_iexecHub: IexecHubV3Interface</text>
-<text text-anchor="start" x="2462.2" y="-472.9" font-family="Times,serif" font-size="14.00">m_v3_scoreImported: mapping(address=&gt;bool)</text>
-<text text-anchor="start" x="2462.2" y="-456.1" font-family="Times,serif" font-size="14.00">m_dealsBoost: mapping(bytes32=&gt;IexecLibCore_v5.DealBoost)</text>
-</g>
-<!-- 25&#45;&gt;26 -->
+<!-- 25&#45;&gt;17 -->
 <g id="edge45" class="edge">
-<title>25&#45;&gt;26</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2720.24,-1067.75C2721.16,-1033.51 2721.7,-990.01 2721.86,-944.84"/>
-<polygon fill="black" stroke="black" points="2725.36,-944.58 2721.89,-934.57 2718.36,-944.56 2725.36,-944.58"/>
+<title>25&#45;&gt;17</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5281.05,-673.98C5247.87,-709.34 5201.79,-753.49 5154.08,-783.6 5116.6,-807.26 5094.91,-790.97 5061.08,-819.6 5002.51,-869.16 4961.71,-948.9 4938.86,-1003.36"/>
+<polygon fill="black" stroke="black" points="4935.51,-1002.3 4934.94,-1012.88 4941.98,-1004.97 4935.51,-1002.3"/>
 </g>
-<!-- 26&#45;&gt;0 -->
-<g id="edge46" class="edge">
-<title>26&#45;&gt;0</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2454.05,-930.3C2451.1,-931.84 2448.14,-933.34 2445.17,-934.8 2109.09,-1099.72 1656.69,-1131.68 1446.5,-1137.22"/>
-<polygon fill="black" stroke="black" points="1446.28,-1133.73 1436.37,-1137.48 1446.46,-1140.73 1446.28,-1133.73"/>
-</g>
-<!-- 26&#45;&gt;25 -->
+<!-- 25&#45;&gt;21 -->
 <g id="edge44" class="edge">
-<title>26&#45;&gt;25</title>
-<path fill="none" stroke="black" d="M2708.44,-934.57C2708.54,-978.23 2709,-1020.88 2709.79,-1055.75"/>
-<polygon fill="black" stroke="black" points="2709.79,-1055.76 2713.94,-1061.65 2710.09,-1067.75 2705.94,-1061.85 2709.79,-1055.76"/>
+<title>25&#45;&gt;21</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5350.4,-674.32C5371.75,-738.18 5406.84,-843.16 5435.13,-927.83"/>
+<polygon fill="black" stroke="black" points="5431.88,-929.15 5438.37,-937.52 5438.52,-926.93 5431.88,-929.15"/>
+</g>
+<!-- 26&#45;&gt;16 -->
+<g id="edge30" class="edge">
+<title>26&#45;&gt;16</title>
+<path fill="none" stroke="black" d="M5599.42,-556.76C5577.25,-523 5545.39,-480.63 5512.08,-447.4 5480.61,-416.02 5444.89,-385.33 5408.86,-356.94"/>
+<polygon fill="black" stroke="black" points="5408.64,-356.77 5401.45,-356.23 5399.19,-349.38 5406.38,-349.92 5408.64,-356.77"/>
+</g>
+<!-- 26&#45;&gt;17 -->
+<g id="edge47" class="edge">
+<title>26&#45;&gt;17</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5585.5,-674.16C5553.19,-712.24 5505.61,-759.42 5452.08,-783.6 5293.03,-855.43 5208.6,-726.38 5061.08,-819.6 4994.71,-861.54 4955.01,-946.05 4934.6,-1003.42"/>
+<polygon fill="black" stroke="black" points="4931.21,-1002.5 4931.24,-1013.09 4937.83,-1004.79 4931.21,-1002.5"/>
+</g>
+<!-- 26&#45;&gt;22 -->
+<g id="edge46" class="edge">
+<title>26&#45;&gt;22</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5648.4,-674.32C5666.34,-727.98 5693.98,-810.68 5719.14,-885.95"/>
+<polygon fill="black" stroke="black" points="5715.86,-887.19 5722.35,-895.57 5722.5,-884.98 5715.86,-887.19"/>
+</g>
+<!-- 27&#45;&gt;28 -->
+<g id="edge49" class="edge">
+<title>27&#45;&gt;28</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1739,-686.65C1738.09,-720.84 1737.55,-764.28 1737.38,-809.38"/>
+<polygon fill="black" stroke="black" points="1733.88,-809.63 1737.35,-819.64 1740.88,-809.65 1733.88,-809.63"/>
+</g>
+<!-- 28&#45;&gt;2 -->
+<g id="edge50" class="edge">
+<title>28&#45;&gt;2</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2005.37,-1303.27C2008.26,-1304.56 2011.16,-1305.8 2014.08,-1307 2125.41,-1352.8 2931.41,-1366.83 3236.49,-1370.53"/>
+<polygon fill="black" stroke="black" points="3236.65,-1374.03 3246.69,-1370.65 3236.73,-1367.03 3236.65,-1374.03"/>
+</g>
+<!-- 28&#45;&gt;27 -->
+<g id="edge48" class="edge">
+<title>28&#45;&gt;27</title>
+<path fill="none" stroke="black" d="M1750.8,-819.64C1750.7,-776.23 1750.25,-733.83 1749.46,-699.09"/>
+<polygon fill="black" stroke="black" points="1749.45,-698.64 1745.3,-692.74 1749.15,-686.65 1753.3,-692.55 1749.45,-698.64"/>
 </g>
 </g>
 </svg>
diff --git a/scripts/tools/sol-to-uml.mjs b/scripts/tools/sol-to-uml.mjs
index bbf1fe69f..0b7820954 100644
--- a/scripts/tools/sol-to-uml.mjs
+++ b/scripts/tools/sol-to-uml.mjs
@@ -13,7 +13,7 @@ await generateClassDiagramOfDirectory('registries');
 
 await generateClassDiagramOfContracts(['IexecPoco1Facet', 'IexecPoco2Facet'], 'IexecPocoFacets');
 
-await generateClassDiagramOfContracts(['IexecEscrowTokenFacet', 'IexecEscrow'], 'IexecEscrows');
+await generateClassDiagramOfContracts(['IexecEscrowTokenFacet', 'EscrowLib'], 'IexecEscrows');
 
 await generateClassDiagramOfContracts(['IexecPocoBoostFacet'], 'IexecPocoBoostFacet');
 

From 0d6428a7223dae5022e6940eb008e5c51054abed Mon Sep 17 00:00:00 2001
From: Zied <26070035+zguesmi@users.noreply.github.com>
Date: Tue, 1 Sep 2026 16:21:27 +0200
Subject: [PATCH 13/17] chore: update archi file

---
 .agents/context/architecture.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.agents/context/architecture.md b/.agents/context/architecture.md
index fbf66a1e4..99a05a790 100644
--- a/.agents/context/architecture.md
+++ b/.agents/context/architecture.md
@@ -7,7 +7,7 @@
 -   Protocol logic: `contracts/facets/*Facet.sol`
 -   External API declarations: `contracts/interfaces/`
 -   `contracts/IexecInterfaceToken.sol` aggregates them into the single interface downstream tools compile against
--   Shared helpers: `contracts/abstract/` for inherited bases (`FacetBase`, `IexecEscrow`) and `contracts/libs/` for stateless helper libraries (`CommonLib`, `PocoStorageLib`, …)
+-   Shared helpers: `contracts/abstract/` for inherited bases (`FacetBase`) and `contracts/libs/` for stateless helper libraries (`CommonLib`, `EscrowLib`, `PocoStorageLib`, …)
 -   Storage lives in one struct accessed through `contracts/libs/PocoStorageLib.sol`, shared by every facet: **never reorder or remove an existing variable, only append**. `npm run check-storage-layout` is the CI gate.
 -   Adding or removing a facet means editing two hand-maintained lists: `utils/proxy-tools.ts#getAllLocalFacetFunctions` (selector-to-name map used by upgrades) and the facet groups in `scripts/tools/sol-to-uml.mjs`.
 

From 63f8f8f1a32906a2d860427e284989f68fac0756 Mon Sep 17 00:00:00 2001
From: Zied <26070035+zguesmi@users.noreply.github.com>
Date: Tue, 1 Sep 2026 16:49:25 +0200
Subject: [PATCH 14/17] fix: keep the Yul unused pruner enabled under coverage

Coverage failed with 25 errors as soon as the shared helpers became
libraries. The first failure is the real one, the other 24 cascade from it:

    TypeError: Cannot read properties of undefined (reading 'replace')
      at Function.linkBytecode (typechain/factories/.../IexecPocoAccessorsFacet__factory.ts)

CommonLib and EscrowLib expose only internal functions, so their code is
inlined and their addresses are never used at runtime. But solc's IR
pipeline emits a linkersymbol reference for every library a contract uses
and leaves the Yul unused pruner to drop it once it is unreachable. The
main build runs that pruner, `optimizerSteps: 'u'`; .solcover.js disabled
every step with `optimizerSteps: ''`, so the dead reference survived into
the artifact. Typechain then generated the linkLibraryAddresses variant of
the factory constructor for facets that need no linking, and
deploy/0_deploy.ts builds those with a signer alone.

The throw left CreateX half-deployed, so every later loadFixture re-ran
against dirty state and failed with "Nonce too low. Expected nonce to be 1
but got 0".

Enabling the pruner removes the reference. Verified: the only link
reference left on the facets is IexecLibOrders_v5, which does have public
functions and is linked in both builds; coverage compiles without the
stack-too-deep that a full optimizer step list causes; and the totals are
unchanged at 99.69 / 96.55 / 99.44 / 99.53, with CommonLib and EscrowLib
at 100.
---
 .solcover.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.solcover.js b/.solcover.js
index 4d2eefc89..a06cea406 100644
--- a/.solcover.js
+++ b/.solcover.js
@@ -7,7 +7,7 @@ module.exports = {
     solcOptimizerDetails: {
         yul: true,
         yulDetails: {
-            optimizerSteps: '',
+            optimizerSteps: 'u',
         },
     },
     mocha: {

From 26122c97e24b7d5682af58fa6d60c9ecf24cbce1 Mon Sep 17 00:00:00 2001
From: Zied <26070035+zguesmi@users.noreply.github.com>
Date: Wed, 2 Sep 2026 11:06:13 +0200
Subject: [PATCH 15/17] chore: clean comment

---
 contracts/libs/EscrowLib.sol | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/contracts/libs/EscrowLib.sol b/contracts/libs/EscrowLib.sol
index dfade1f9d..378c39443 100644
--- a/contracts/libs/EscrowLib.sol
+++ b/contracts/libs/EscrowLib.sol
@@ -6,14 +6,10 @@ import {PocoStorageLib} from "./PocoStorageLib.sol";
 
 /**
  * @title Manage (lock/unlock/reward/seize) user funds.
- * @dev The events are declared here rather than taken from {IexecEscrowEvents}
- * because solc 0.8.21 cannot compile a qualified `emit Other.Event(...)` when
- * userdoc is requested, and docgen always requests it. A library publishes an
- * event in the ABI of every contract that emits it along an inlined path, so
- * {IexecEscrowEvents} stays as the single declaration feeding the aggregate
- * interface.
  */
 library EscrowLib {
+    /// @dev The events are declared here rather than taken from {IexecEscrowEvents}
+    /// because solc 0.8.21 cannot compile `emit Other.Event(...)`.
     event Transfer(address indexed from, address indexed to, uint256 value);
     event Reward(address owner, uint256 amount, bytes32 ref);
     event Seize(address owner, uint256 amount, bytes32 ref);

From 37c1199d3a137e0e3be0ca250d4b318262773660 Mon Sep 17 00:00:00 2001
From: Zied <26070035+zguesmi@users.noreply.github.com>
Date: Wed, 2 Sep 2026 11:21:30 +0200
Subject: [PATCH 16/17] refactor: split the sRLC ledger out of EscrowLib into
 StakedRlcLib

EscrowLib held two concerns. The storage says so: m_totalSupply, m_balances
and m_allowances belong to the sRLC token, while m_frozens belongs to the
escrow laid on top of it, and `lock` is literally a transfer followed by a
bump of m_frozens.

StakedRlcLib now owns every writer of the ledger: transfer, plus mint, burn
and approve moved over from IexecEscrowTokenFacet, which had held a third of
it since before the diamond migration. EscrowLib keeps lock, unlock, reward,
seize and rewardAndLock, owns m_frozens alone, and defers every balance move
to StakedRlcLib.

IexecEscrowToken no longer inherits IexecEscrowEvents. It did so only to
give the facet the event declarations it emitted; the facet now takes them
from the libraries it calls. Without this the facet would have carried both
Transfer and Approval twice in its ABI, since a library publishes an event
in the ABI of every contract that emits it along an inlined path. The
aggregate keeps the events by inheriting IexecEscrowEvents directly, and
IexecInterfaceToken.json is byte-identical.

This removes the duplicate Transfer entry left by the escrow conversion, so
the 14 typechain duplicate-identifier errors are gone and `tsc --noEmit` is
back to its 40, of which 6 are outside typechain and pre-existing.

The three transfer revert strings move from the "IexecEscrow: " prefix to
"ERC20: ", matching the mint, burn and approve messages that arrived with
them; 20 assertions across 6 test files follow.
---
 .../facets/IexecEscrowTokenFacet.json         | 113 --------------
 .../interfaces/IexecEscrowToken.json          | 138 ------------------
 abis/contracts/libs/EscrowLib.json            |  25 ----
 abis/contracts/libs/StakedRlcLib.json         |  52 +++++++
 .../IexecEscrowTokenFacet.json                |   5 -
 .../IexecEscrowToken.json                     |   6 -
 .../libs/EscrowLib.sol/EscrowLib.json         |   1 -
 .../libs/StakedRlcLib.sol/StakedRlcLib.json   |   4 +
 contracts/IexecInterfaceToken.sol             |   2 +
 contracts/facets/IexecEscrowTokenFacet.sol    |  62 +++-----
 contracts/interfaces/IexecEscrowToken.sol     |   4 +-
 contracts/libs/EscrowLib.sol                  |  42 +-----
 contracts/libs/StakedRlcLib.sol               |  87 +++++++++++
 test/byContract/IexecERC20/IexecERC20.test.ts |  12 +-
 .../IexecEscrowToken-receiveApproval.test.ts  |   2 +-
 test/byContract/IexecPoco/IexecPoco1.test.ts  |   6 +-
 .../IexecPoco/IexecPoco2-contribute.test.ts   |   2 +-
 .../IexecPocoBoost/IexecEscrow.test.ts        |  12 +-
 .../IexecPocoBoost/IexecPocoBoost.test.ts     |   6 +-
 19 files changed, 197 insertions(+), 384 deletions(-)
 create mode 100644 abis/contracts/libs/StakedRlcLib.json
 create mode 100644 abis/human-readable-abis/contracts/libs/StakedRlcLib.sol/StakedRlcLib.json
 create mode 100644 contracts/libs/StakedRlcLib.sol

diff --git a/abis/contracts/facets/IexecEscrowTokenFacet.json b/abis/contracts/facets/IexecEscrowTokenFacet.json
index d7d8980b0..5adf3d767 100644
--- a/abis/contracts/facets/IexecEscrowTokenFacet.json
+++ b/abis/contracts/facets/IexecEscrowTokenFacet.json
@@ -45,75 +45,6 @@
     "name": "Approval",
     "type": "event"
   },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "address",
-        "name": "owner",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "Lock",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "address",
-        "name": "owner",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      },
-      {
-        "indexed": false,
-        "internalType": "bytes32",
-        "name": "ref",
-        "type": "bytes32"
-      }
-    ],
-    "name": "Reward",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "address",
-        "name": "owner",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      },
-      {
-        "indexed": false,
-        "internalType": "bytes32",
-        "name": "ref",
-        "type": "bytes32"
-      }
-    ],
-    "name": "Seize",
-    "type": "event"
-  },
   {
     "anonymous": false,
     "inputs": [
@@ -139,50 +70,6 @@
     "name": "Transfer",
     "type": "event"
   },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "value",
-        "type": "uint256"
-      }
-    ],
-    "name": "Transfer",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "address",
-        "name": "owner",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "Unlock",
-    "type": "event"
-  },
   {
     "stateMutability": "payable",
     "type": "fallback"
diff --git a/abis/contracts/interfaces/IexecEscrowToken.json b/abis/contracts/interfaces/IexecEscrowToken.json
index 9796f8cf1..be1a4f1dd 100644
--- a/abis/contracts/interfaces/IexecEscrowToken.json
+++ b/abis/contracts/interfaces/IexecEscrowToken.json
@@ -20,144 +20,6 @@
     "name": "UnsupportedOperation",
     "type": "error"
   },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "owner",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "spender",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "value",
-        "type": "uint256"
-      }
-    ],
-    "name": "Approval",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "address",
-        "name": "owner",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "Lock",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "address",
-        "name": "owner",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      },
-      {
-        "indexed": false,
-        "internalType": "bytes32",
-        "name": "ref",
-        "type": "bytes32"
-      }
-    ],
-    "name": "Reward",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "address",
-        "name": "owner",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      },
-      {
-        "indexed": false,
-        "internalType": "bytes32",
-        "name": "ref",
-        "type": "bytes32"
-      }
-    ],
-    "name": "Seize",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "value",
-        "type": "uint256"
-      }
-    ],
-    "name": "Transfer",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "address",
-        "name": "owner",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "Unlock",
-    "type": "event"
-  },
   {
     "stateMutability": "payable",
     "type": "fallback"
diff --git a/abis/contracts/libs/EscrowLib.json b/abis/contracts/libs/EscrowLib.json
index f8f92b4b0..cea6073dc 100644
--- a/abis/contracts/libs/EscrowLib.json
+++ b/abis/contracts/libs/EscrowLib.json
@@ -68,31 +68,6 @@
     "name": "Seize",
     "type": "event"
   },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "value",
-        "type": "uint256"
-      }
-    ],
-    "name": "Transfer",
-    "type": "event"
-  },
   {
     "anonymous": false,
     "inputs": [
diff --git a/abis/contracts/libs/StakedRlcLib.json b/abis/contracts/libs/StakedRlcLib.json
new file mode 100644
index 000000000..fe1bdc880
--- /dev/null
+++ b/abis/contracts/libs/StakedRlcLib.json
@@ -0,0 +1,52 @@
+[
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "owner",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "spender",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "value",
+        "type": "uint256"
+      }
+    ],
+    "name": "Approval",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "from",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "to",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "value",
+        "type": "uint256"
+      }
+    ],
+    "name": "Transfer",
+    "type": "event"
+  }
+]
diff --git a/abis/human-readable-abis/contracts/facets/IexecEscrowTokenFacet.sol/IexecEscrowTokenFacet.json b/abis/human-readable-abis/contracts/facets/IexecEscrowTokenFacet.sol/IexecEscrowTokenFacet.json
index 35fad85c2..f267d464f 100644
--- a/abis/human-readable-abis/contracts/facets/IexecEscrowTokenFacet.sol/IexecEscrowTokenFacet.json
+++ b/abis/human-readable-abis/contracts/facets/IexecEscrowTokenFacet.sol/IexecEscrowTokenFacet.json
@@ -3,12 +3,7 @@
   "error OperationFailed()",
   "error UnsupportedOperation(bytes4)",
   "event Approval(address indexed,address indexed,uint256)",
-  "event Lock(address,uint256)",
-  "event Reward(address,uint256,bytes32)",
-  "event Seize(address,uint256,bytes32)",
   "event Transfer(address indexed,address indexed,uint256)",
-  "event Transfer(address indexed,address indexed,uint256)",
-  "event Unlock(address,uint256)",
   "function approve(address,uint256) returns (bool)",
   "function approveAndCall(address,uint256,bytes) returns (bool)",
   "function decreaseAllowance(address,uint256) returns (bool)",
diff --git a/abis/human-readable-abis/contracts/interfaces/IexecEscrowToken.sol/IexecEscrowToken.json b/abis/human-readable-abis/contracts/interfaces/IexecEscrowToken.sol/IexecEscrowToken.json
index b1d2b9e51..f3fe78992 100644
--- a/abis/human-readable-abis/contracts/interfaces/IexecEscrowToken.sol/IexecEscrowToken.json
+++ b/abis/human-readable-abis/contracts/interfaces/IexecEscrowToken.sol/IexecEscrowToken.json
@@ -2,12 +2,6 @@
   "error CallerIsNotTheRequester()",
   "error OperationFailed()",
   "error UnsupportedOperation(bytes4)",
-  "event Approval(address indexed,address indexed,uint256)",
-  "event Lock(address,uint256)",
-  "event Reward(address,uint256,bytes32)",
-  "event Seize(address,uint256,bytes32)",
-  "event Transfer(address indexed,address indexed,uint256)",
-  "event Unlock(address,uint256)",
   "function approve(address,uint256) returns (bool)",
   "function approveAndCall(address,uint256,bytes) returns (bool)",
   "function decreaseAllowance(address,uint256) returns (bool)",
diff --git a/abis/human-readable-abis/contracts/libs/EscrowLib.sol/EscrowLib.json b/abis/human-readable-abis/contracts/libs/EscrowLib.sol/EscrowLib.json
index 1c6711547..e70f2078f 100644
--- a/abis/human-readable-abis/contracts/libs/EscrowLib.sol/EscrowLib.json
+++ b/abis/human-readable-abis/contracts/libs/EscrowLib.sol/EscrowLib.json
@@ -2,6 +2,5 @@
   "event Lock(address,uint256)",
   "event Reward(address,uint256,bytes32)",
   "event Seize(address,uint256,bytes32)",
-  "event Transfer(address indexed,address indexed,uint256)",
   "event Unlock(address,uint256)"
 ]
diff --git a/abis/human-readable-abis/contracts/libs/StakedRlcLib.sol/StakedRlcLib.json b/abis/human-readable-abis/contracts/libs/StakedRlcLib.sol/StakedRlcLib.json
new file mode 100644
index 000000000..c145a777d
--- /dev/null
+++ b/abis/human-readable-abis/contracts/libs/StakedRlcLib.sol/StakedRlcLib.json
@@ -0,0 +1,4 @@
+[
+  "event Approval(address indexed,address indexed,uint256)",
+  "event Transfer(address indexed,address indexed,uint256)"
+]
diff --git a/contracts/IexecInterfaceToken.sol b/contracts/IexecInterfaceToken.sol
index 2d0803981..5d0a70ce5 100644
--- a/contracts/IexecInterfaceToken.sol
+++ b/contracts/IexecInterfaceToken.sol
@@ -7,6 +7,7 @@ import {IexecAccessorsABILegacy} from "./interfaces/IexecAccessorsABILegacy.sol"
 import {IexecCategoryManager} from "./interfaces/IexecCategoryManager.sol";
 import {IexecConfiguration} from "./interfaces/IexecConfiguration.sol";
 import {IexecConfigurationExtra} from "./interfaces/IexecConfigurationExtra.sol";
+import {IexecEscrowEvents} from "./interfaces/IexecEscrowEvents.sol";
 import {IexecEscrowToken} from "./interfaces/IexecEscrowToken.sol";
 import {IexecOrderManagement} from "./interfaces/IexecOrderManagement.sol";
 import {IexecPoco1} from "./interfaces/IexecPoco1.sol";
@@ -34,6 +35,7 @@ interface IexecInterfaceToken is
     IexecCategoryManager,
     IexecConfiguration,
     IexecConfigurationExtra,
+    IexecEscrowEvents,
     IexecEscrowToken,
     IexecOrderManagement,
     IexecPoco1,
diff --git a/contracts/facets/IexecEscrowTokenFacet.sol b/contracts/facets/IexecEscrowTokenFacet.sol
index b6d608ce4..54a45a5e5 100644
--- a/contracts/facets/IexecEscrowTokenFacet.sol
+++ b/contracts/facets/IexecEscrowTokenFacet.sol
@@ -5,6 +5,7 @@ pragma solidity ^0.8.0;
 
 import {FacetBase} from "../abstract/FacetBase.sol";
 import {EscrowLib} from "../libs/EscrowLib.sol";
+import {StakedRlcLib} from "../libs/StakedRlcLib.sol";
 import {IexecEscrowToken} from "../interfaces/IexecEscrowToken.sol";
 import {IexecTokenSpender} from "../interfaces/IexecTokenSpender.sol";
 import {IexecPoco1} from "../interfaces/IexecPoco1.sol";
@@ -24,7 +25,6 @@ import {PocoStorageLib} from "../libs/PocoStorageLib.sol";
  * escrow itself (lock, unlock, reward, seize) run over the same ledger.
  */
 // TODO rename to IexecEscrowFacet
-// TODO move _mint, _burn and _approve into EscrowLib.
 contract IexecEscrowTokenFacet is IexecEscrowToken, IexecTokenSpender, FacetBase {
     /***************************************************************************
      *                     Deposit and withdraw functions                      *
@@ -39,13 +39,13 @@ contract IexecEscrowTokenFacet is IexecEscrowToken, IexecTokenSpender, FacetBase
 
     function deposit(uint256 amount) external override returns (bool) {
         _deposit(_msgSender(), amount);
-        _mint(_msgSender(), amount);
+        StakedRlcLib.mint(_msgSender(), amount);
         return true;
     }
 
     function depositFor(uint256 amount, address target) external override returns (bool) {
         _deposit(_msgSender(), amount);
-        _mint(target, amount);
+        StakedRlcLib.mint(target, amount);
         return true;
     }
 
@@ -56,19 +56,19 @@ contract IexecEscrowTokenFacet is IexecEscrowToken, IexecTokenSpender, FacetBase
         require(amounts.length == targets.length, "invalid-array-length");
         for (uint i = 0; i < amounts.length; ++i) {
             _deposit(_msgSender(), amounts[i]);
-            _mint(targets[i], amounts[i]);
+            StakedRlcLib.mint(targets[i], amounts[i]);
         }
         return true;
     }
 
     function withdraw(uint256 amount) external override returns (bool) {
-        _burn(_msgSender(), amount);
+        StakedRlcLib.burn(_msgSender(), amount);
         _withdraw(_msgSender(), amount);
         return true;
     }
 
     function withdrawTo(uint256 amount, address target) external override returns (bool) {
-        _burn(_msgSender(), amount);
+        StakedRlcLib.burn(_msgSender(), amount);
         _withdraw(target, amount);
         return true;
     }
@@ -76,7 +76,7 @@ contract IexecEscrowTokenFacet is IexecEscrowToken, IexecTokenSpender, FacetBase
     function recover() external override onlyOwner returns (uint256) {
         PocoStorageLib.PocoStorage storage $ = PocoStorageLib.getPocoStorage();
         uint256 delta = $.m_baseToken.balanceOf(address(this)) - $.m_totalSupply;
-        _mint(owner(), delta);
+        StakedRlcLib.mint(owner(), delta);
         return delta;
     }
 
@@ -142,7 +142,7 @@ contract IexecEscrowTokenFacet is IexecEscrowToken, IexecTokenSpender, FacetBase
         PocoStorageLib.PocoStorage storage $ = PocoStorageLib.getPocoStorage();
         require(token == address($.m_baseToken), "wrong-token");
         _deposit(sender, amount);
-        _mint(sender, amount);
+        StakedRlcLib.mint(sender, amount);
         if (data.length > 0) {
             _executeOperation(sender, data);
         }
@@ -218,12 +218,12 @@ contract IexecEscrowTokenFacet is IexecEscrowToken, IexecTokenSpender, FacetBase
      ***************************************************************************/
 
     function transfer(address recipient, uint256 amount) external override returns (bool) {
-        EscrowLib.transfer(_msgSender(), recipient, amount);
+        StakedRlcLib.transfer(_msgSender(), recipient, amount);
         return true;
     }
 
     function approve(address spender, uint256 value) external override returns (bool) {
-        _approve(_msgSender(), spender, value);
+        StakedRlcLib.approve(_msgSender(), spender, value);
         return true;
     }
 
@@ -232,7 +232,7 @@ contract IexecEscrowTokenFacet is IexecEscrowToken, IexecTokenSpender, FacetBase
         uint256 value,
         bytes calldata extraData
     ) external override returns (bool) {
-        _approve(_msgSender(), spender, value);
+        StakedRlcLib.approve(_msgSender(), spender, value);
         require(
             IexecTokenSpender(spender).receiveApproval(
                 _msgSender(),
@@ -251,8 +251,8 @@ contract IexecEscrowTokenFacet is IexecEscrowToken, IexecTokenSpender, FacetBase
         uint256 amount
     ) external override returns (bool) {
         PocoStorageLib.PocoStorage storage $ = PocoStorageLib.getPocoStorage();
-        EscrowLib.transfer(sender, recipient, amount);
-        _approve(sender, _msgSender(), $.m_allowances[sender][_msgSender()] - amount);
+        StakedRlcLib.transfer(sender, recipient, amount);
+        StakedRlcLib.approve(sender, _msgSender(), $.m_allowances[sender][_msgSender()] - amount);
         return true;
     }
 
@@ -261,7 +261,11 @@ contract IexecEscrowTokenFacet is IexecEscrowToken, IexecTokenSpender, FacetBase
         uint256 addedValue
     ) external override returns (bool) {
         PocoStorageLib.PocoStorage storage $ = PocoStorageLib.getPocoStorage();
-        _approve(_msgSender(), spender, $.m_allowances[_msgSender()][spender] + addedValue);
+        StakedRlcLib.approve(
+            _msgSender(),
+            spender,
+            $.m_allowances[_msgSender()][spender] + addedValue
+        );
         return true;
     }
 
@@ -270,31 +274,11 @@ contract IexecEscrowTokenFacet is IexecEscrowToken, IexecTokenSpender, FacetBase
         uint256 subtractedValue
     ) external override returns (bool) {
         PocoStorageLib.PocoStorage storage $ = PocoStorageLib.getPocoStorage();
-        _approve(_msgSender(), spender, $.m_allowances[_msgSender()][spender] - subtractedValue);
+        StakedRlcLib.approve(
+            _msgSender(),
+            spender,
+            $.m_allowances[_msgSender()][spender] - subtractedValue
+        );
         return true;
     }
-
-    function _mint(address account, uint256 amount) internal {
-        require(account != address(0), "ERC20: mint to the zero address");
-        PocoStorageLib.PocoStorage storage $ = PocoStorageLib.getPocoStorage();
-        $.m_totalSupply = $.m_totalSupply + amount;
-        $.m_balances[account] = $.m_balances[account] + amount;
-        emit Transfer(address(0), account, amount);
-    }
-
-    function _burn(address account, uint256 amount) internal {
-        require(account != address(0), "ERC20: burn from the zero address");
-        PocoStorageLib.PocoStorage storage $ = PocoStorageLib.getPocoStorage();
-        $.m_totalSupply = $.m_totalSupply - amount;
-        $.m_balances[account] = $.m_balances[account] - amount;
-        emit Transfer(account, address(0), amount);
-    }
-
-    function _approve(address owner, address spender, uint256 amount) internal {
-        require(owner != address(0), "ERC20: approve from the zero address");
-        require(spender != address(0), "ERC20: approve to the zero address");
-        PocoStorageLib.PocoStorage storage $ = PocoStorageLib.getPocoStorage();
-        $.m_allowances[owner][spender] = amount;
-        emit Approval(owner, spender, amount);
-    }
 }
diff --git a/contracts/interfaces/IexecEscrowToken.sol b/contracts/interfaces/IexecEscrowToken.sol
index 5d0334198..a25b49ed8 100644
--- a/contracts/interfaces/IexecEscrowToken.sol
+++ b/contracts/interfaces/IexecEscrowToken.sol
@@ -3,9 +3,7 @@
 
 pragma solidity ^0.8.0;
 
-import {IexecEscrowEvents} from "./IexecEscrowEvents.sol";
-
-interface IexecEscrowToken is IexecEscrowEvents {
+interface IexecEscrowToken {
     error UnsupportedOperation(bytes4 selector);
     error OperationFailed();
     error CallerIsNotTheRequester();
diff --git a/contracts/libs/EscrowLib.sol b/contracts/libs/EscrowLib.sol
index 378c39443..f7d2edf22 100644
--- a/contracts/libs/EscrowLib.sol
+++ b/contracts/libs/EscrowLib.sol
@@ -3,14 +3,16 @@
 
 pragma solidity ^0.8.0;
 import {PocoStorageLib} from "./PocoStorageLib.sol";
+import {StakedRlcLib} from "./StakedRlcLib.sol";
 
 /**
  * @title Manage (lock/unlock/reward/seize) user funds.
+ * @notice The escrow layers on top of the sRLC ledger: it owns `m_frozens` and
+ * defers every balance move to {StakedRlcLib}.
+ * @dev The events are declared here rather than taken from {IexecEscrowEvents}
+ * because solc 0.8.21 cannot compile `emit Other.Event(...)`.
  */
 library EscrowLib {
-    /// @dev The events are declared here rather than taken from {IexecEscrowEvents}
-    /// because solc 0.8.21 cannot compile `emit Other.Event(...)`.
-    event Transfer(address indexed from, address indexed to, uint256 value);
     event Reward(address owner, uint256 amount, bytes32 ref);
     event Seize(address owner, uint256 amount, bytes32 ref);
     event Lock(address owner, uint256 amount);
@@ -23,7 +25,7 @@ library EscrowLib {
      */
     function lock(address account, uint256 value) internal {
         PocoStorageLib.PocoStorage storage $ = PocoStorageLib.getPocoStorage();
-        transfer(account, address(this), value);
+        StakedRlcLib.transfer(account, address(this), value);
         $.m_frozens[account] += value;
         emit Lock(account, value);
     }
@@ -35,7 +37,7 @@ library EscrowLib {
      */
     function unlock(address account, uint256 value) internal {
         PocoStorageLib.PocoStorage storage $ = PocoStorageLib.getPocoStorage();
-        transfer(address(this), account, value);
+        StakedRlcLib.transfer(address(this), account, value);
         $.m_frozens[account] -= value;
         emit Unlock(account, value);
     }
@@ -47,7 +49,7 @@ library EscrowLib {
      * @param ref A reference of the reward context.
      */
     function reward(address account, uint256 value, bytes32 ref) internal {
-        transfer(address(this), account, value);
+        StakedRlcLib.transfer(address(this), account, value);
         emit Reward(account, value, ref);
     }
 
@@ -78,32 +80,4 @@ library EscrowLib {
         emit Reward(account, value, ref);
         emit Lock(account, value);
     }
-
-    /**
-     * Transfer value from a spender account to a receiver account.
-     * @notice
-     * This is the single implementation of an sRLC balance move. It backs both
-     * the escrow operations declared above (lock, unlock, reward) and the ERC-20
-     * entry points of {IexecEscrowTokenFacet}.
-     * A self-transfer is a no-op on the balances and is not rejected.
-     *
-     * @param from The address of the spender account.
-     * @param to The address of the receiver account.
-     * @param value The value to transfer.
-     */
-    function transfer(address from, address to, uint256 value) internal {
-        require(from != address(0), "IexecEscrow: Transfer from empty address");
-        require(to != address(0), "IexecEscrow: Transfer to empty address");
-        PocoStorageLib.PocoStorage storage $ = PocoStorageLib.getPocoStorage();
-        uint256 fromBalance = $.m_balances[from];
-        require(value <= fromBalance, "IexecEscrow: Transfer amount exceeds balance");
-        // This block is guaranteed to not underflow because we check the from balance
-        // and guaranteed to not overflow because the total supply is capped and there
-        // is no minting involved.
-        unchecked {
-            $.m_balances[from] = fromBalance - value;
-            $.m_balances[to] += value;
-        }
-        emit Transfer(from, to, value);
-    }
 }
diff --git a/contracts/libs/StakedRlcLib.sol b/contracts/libs/StakedRlcLib.sol
new file mode 100644
index 000000000..fcbe1e41a
--- /dev/null
+++ b/contracts/libs/StakedRlcLib.sol
@@ -0,0 +1,87 @@
+// SPDX-FileCopyrightText: 2020-2025 IEXEC BLOCKCHAIN TECH <contact@iex.ec>
+// SPDX-License-Identifier: Apache-2.0
+
+pragma solidity ^0.8.0;
+
+import {PocoStorageLib} from "./PocoStorageLib.sol";
+
+/**
+ * @title The sRLC ledger.
+ * @notice sRLC ("Staked RLC") is the internal token of the PoCo protocol. It is
+ * not a standalone contract: its total supply, balances and allowances live in
+ * the PoCo storage. This library is the single owner of every write to them.
+ * @dev The events are declared here rather than taken from {IexecEscrowEvents}
+ * because solc 0.8.21 cannot compile `emit Other.Event(...)`.
+ */
+library StakedRlcLib {
+    event Transfer(address indexed from, address indexed to, uint256 value);
+    event Approval(address indexed owner, address indexed spender, uint256 value);
+
+    /**
+     * Transfer value from a spender account to a receiver account.
+     * @notice
+     * This is the single implementation of an sRLC balance move. It backs both
+     * the escrow operations of {EscrowLib} and the ERC-20 entry points of
+     * {IexecEscrowTokenFacet}.
+     * A self-transfer is a no-op on the balances and is not rejected.
+     *
+     * @param from The address of the spender account.
+     * @param to The address of the receiver account.
+     * @param value The value to transfer.
+     */
+    function transfer(address from, address to, uint256 value) internal {
+        require(from != address(0), "ERC20: Transfer from empty address");
+        require(to != address(0), "ERC20: Transfer to empty address");
+        PocoStorageLib.PocoStorage storage $ = PocoStorageLib.getPocoStorage();
+        uint256 fromBalance = $.m_balances[from];
+        require(value <= fromBalance, "ERC20: Transfer amount exceeds balance");
+        // This block is guaranteed to not underflow because we check the from balance
+        // and guaranteed to not overflow because the total supply is capped and there
+        // is no minting involved.
+        unchecked {
+            $.m_balances[from] = fromBalance - value;
+            $.m_balances[to] += value;
+        }
+        emit Transfer(from, to, value);
+    }
+
+    /**
+     * Create sRLC and credit it to an account.
+     * @param account The account to credit.
+     * @param amount The amount to create.
+     */
+    function mint(address account, uint256 amount) internal {
+        require(account != address(0), "ERC20: mint to the zero address");
+        PocoStorageLib.PocoStorage storage $ = PocoStorageLib.getPocoStorage();
+        $.m_totalSupply = $.m_totalSupply + amount;
+        $.m_balances[account] = $.m_balances[account] + amount;
+        emit Transfer(address(0), account, amount);
+    }
+
+    /**
+     * Destroy sRLC held by an account.
+     * @param account The account to debit.
+     * @param amount The amount to destroy.
+     */
+    function burn(address account, uint256 amount) internal {
+        require(account != address(0), "ERC20: burn from the zero address");
+        PocoStorageLib.PocoStorage storage $ = PocoStorageLib.getPocoStorage();
+        $.m_totalSupply = $.m_totalSupply - amount;
+        $.m_balances[account] = $.m_balances[account] - amount;
+        emit Transfer(account, address(0), amount);
+    }
+
+    /**
+     * Set the allowance of a spender over an owner's sRLC.
+     * @param owner The account granting the allowance.
+     * @param spender The account receiving the allowance.
+     * @param amount The allowed amount.
+     */
+    function approve(address owner, address spender, uint256 amount) internal {
+        require(owner != address(0), "ERC20: approve from the zero address");
+        require(spender != address(0), "ERC20: approve to the zero address");
+        PocoStorageLib.PocoStorage storage $ = PocoStorageLib.getPocoStorage();
+        $.m_allowances[owner][spender] = amount;
+        emit Approval(owner, spender, amount);
+    }
+}
diff --git a/test/byContract/IexecERC20/IexecERC20.test.ts b/test/byContract/IexecERC20/IexecERC20.test.ts
index 26bfcd606..6b015f438 100644
--- a/test/byContract/IexecERC20/IexecERC20.test.ts
+++ b/test/byContract/IexecERC20/IexecERC20.test.ts
@@ -87,17 +87,17 @@ describe('ERC20', async () => {
         it('Should not transfer from the zero address', async () => {
             await expect(
                 iexecPoco.connect(zeroAddressSigner).transfer(recipient.address, value),
-            ).to.be.revertedWith('IexecEscrow: Transfer from empty address');
+            ).to.be.revertedWith('ERC20: Transfer from empty address');
         });
         it('Should not transfer to the zero address', async () => {
             await expect(iexecPocoAsHolder.transfer(ZeroAddress, value)).to.be.revertedWith(
-                'IexecEscrow: Transfer to empty address',
+                'ERC20: Transfer to empty address',
             );
         });
         it('Should not transfer when sender balance is too low', async () => {
             await expect(
                 iexecPocoAsHolder.transfer(recipient.address, value + 1n),
-            ).to.be.revertedWith('IexecEscrow: Transfer amount exceeds balance');
+            ).to.be.revertedWith('ERC20: Transfer amount exceeds balance');
         });
     });
 
@@ -191,17 +191,17 @@ describe('ERC20', async () => {
         it('Should not transferFrom when owner is the zero address', async () => {
             await expect(
                 iexecPocoAsSpender.transferFrom(ZeroAddress, spender.address, value),
-            ).to.be.revertedWith('IexecEscrow: Transfer from empty address');
+            ).to.be.revertedWith('ERC20: Transfer from empty address');
         });
         it('Should not transferFrom to the zero address', async () => {
             await expect(
                 iexecPocoAsSpender.transferFrom(holder.address, ZeroAddress, value),
-            ).to.be.revertedWith('IexecEscrow: Transfer to empty address');
+            ).to.be.revertedWith('ERC20: Transfer to empty address');
         });
         it('Should not transferFrom when owner balance is too low', async () => {
             await expect(
                 iexecPocoAsSpender.transferFrom(holder.address, spender.address, value + 1n),
-            ).to.be.revertedWith('IexecEscrow: Transfer amount exceeds balance');
+            ).to.be.revertedWith('ERC20: Transfer amount exceeds balance');
         });
         it('Should not transferFrom when spender allowance is too low', async () => {
             await iexecPocoAsHolder.approve(spender.address, value - 1n).then((tx) => tx.wait());
diff --git a/test/byContract/IexecEscrow/IexecEscrowToken-receiveApproval.test.ts b/test/byContract/IexecEscrow/IexecEscrowToken-receiveApproval.test.ts
index c48eb1aa3..92c520dce 100644
--- a/test/byContract/IexecEscrow/IexecEscrowToken-receiveApproval.test.ts
+++ b/test/byContract/IexecEscrow/IexecEscrowToken-receiveApproval.test.ts
@@ -338,7 +338,7 @@ describe('IexecEscrowToken-receiveApproval', () => {
                     insufficientAmount,
                     await matchOrdersCalldata(orders),
                 ),
-            ).to.be.revertedWith('IexecEscrow: Transfer amount exceeds balance');
+            ).to.be.revertedWith('ERC20: Transfer amount exceeds balance');
         });
 
         it('Should revert with unsupported operation error for unknown function selector', async () => {
diff --git a/test/byContract/IexecPoco/IexecPoco1.test.ts b/test/byContract/IexecPoco/IexecPoco1.test.ts
index 83a2690da..6cb07c235 100644
--- a/test/byContract/IexecPoco/IexecPoco1.test.ts
+++ b/test/byContract/IexecPoco/IexecPoco1.test.ts
@@ -999,7 +999,7 @@ describe('IexecPoco1', () => {
             expect(await iexecPoco.balanceOf(scheduler.address)).to.equal(schedulerStake);
             await signOrders(iexecWrapper.getDomain(), orders, ordersActors);
             await expect(iexecPocoAsRequester.matchOrders(...orders.toArray())).to.be.revertedWith(
-                'IexecEscrow: Transfer amount exceeds balance',
+                'ERC20: Transfer amount exceeds balance',
             );
         });
 
@@ -1016,7 +1016,7 @@ describe('IexecPoco1', () => {
             expect(await iexecPoco.balanceOf(scheduler.address)).to.be.lessThan(schedulerStake);
             await signOrders(iexecWrapper.getDomain(), orders, ordersActors);
             await expect(iexecPocoAsRequester.matchOrders(...orders.toArray())).to.be.revertedWith(
-                'IexecEscrow: Transfer amount exceeds balance',
+                'ERC20: Transfer amount exceeds balance',
             );
         });
     });
@@ -1099,7 +1099,7 @@ describe('IexecPoco1', () => {
             await signOrders(iexecWrapper.getDomain(), orders, ordersActors);
             await expect(
                 iexecPocoAsSponsor.sponsorMatchOrders(...orders.toArray()),
-            ).to.be.revertedWith('IexecEscrow: Transfer amount exceeds balance');
+            ).to.be.revertedWith('ERC20: Transfer amount exceeds balance');
         });
     });
 
diff --git a/test/byContract/IexecPoco/IexecPoco2-contribute.test.ts b/test/byContract/IexecPoco/IexecPoco2-contribute.test.ts
index b9e5600d4..a8931ed6a 100644
--- a/test/byContract/IexecPoco/IexecPoco2-contribute.test.ts
+++ b/test/byContract/IexecPoco/IexecPoco2-contribute.test.ts
@@ -519,7 +519,7 @@ describe('IexecPoco2#contribute', () => {
                         scheduler,
                     ),
                 ),
-            ).to.be.revertedWith('IexecEscrow: Transfer amount exceeds balance');
+            ).to.be.revertedWith('ERC20: Transfer amount exceeds balance');
         });
     });
 });
diff --git a/test/byContract/IexecPocoBoost/IexecEscrow.test.ts b/test/byContract/IexecPocoBoost/IexecEscrow.test.ts
index 7a38a6888..06aba2bf7 100644
--- a/test/byContract/IexecPocoBoost/IexecEscrow.test.ts
+++ b/test/byContract/IexecPocoBoost/IexecEscrow.test.ts
@@ -53,14 +53,14 @@ describe('IexecEscrow', function () {
 
         it('Should not lock funds for empty address', async function () {
             await expect(iexecEscrow.lock_(ZeroAddress, amount)).to.be.revertedWith(
-                'IexecEscrow: Transfer from empty address',
+                'ERC20: Transfer from empty address',
             );
         });
 
         it('Should not lock funds when insufficient balance', async function () {
             await expect(
                 iexecEscrow.lock_(account.address, accountBalance + 1n),
-            ).to.be.revertedWith('IexecEscrow: Transfer amount exceeds balance');
+            ).to.be.revertedWith('ERC20: Transfer amount exceeds balance');
         });
     });
 
@@ -86,13 +86,13 @@ describe('IexecEscrow', function () {
 
         it('Should not unlock funds for empty address', async function () {
             await expect(iexecEscrow.unlock_(ZeroAddress, amount)).to.be.revertedWith(
-                'IexecEscrow: Transfer to empty address',
+                'ERC20: Transfer to empty address',
             );
         });
 
         it('Should not unlock funds when insufficient balance', async function () {
             await expect(iexecEscrow.unlock_(account.address, amount)).to.be.revertedWith(
-                'IexecEscrow: Transfer amount exceeds balance',
+                'ERC20: Transfer amount exceeds balance',
             );
         });
     });
@@ -117,13 +117,13 @@ describe('IexecEscrow', function () {
 
         it('Should not reward empty address', async function () {
             await expect(iexecEscrow.reward_(ZeroAddress, amount, HashZero)).to.be.revertedWith(
-                'IexecEscrow: Transfer to empty address',
+                'ERC20: Transfer to empty address',
             );
         });
 
         it('Should not reward when insufficient balance', async function () {
             await expect(iexecEscrow.reward_(account.address, amount, HashZero)).to.be.revertedWith(
-                'IexecEscrow: Transfer amount exceeds balance',
+                'ERC20: Transfer amount exceeds balance',
             );
         });
     });
diff --git a/test/byContract/IexecPocoBoost/IexecPocoBoost.test.ts b/test/byContract/IexecPocoBoost/IexecPocoBoost.test.ts
index 6d798850a..05c2a1ec9 100644
--- a/test/byContract/IexecPocoBoost/IexecPocoBoost.test.ts
+++ b/test/byContract/IexecPocoBoost/IexecPocoBoost.test.ts
@@ -1277,7 +1277,7 @@ describe('IexecPocoBoost', function () {
             await signOrders(domain, orders, ordersActors);
             await expect(
                 iexecPocoBoostInstance.matchOrdersBoost(...orders.toArray()),
-            ).to.be.revertedWith('IexecEscrow: Transfer amount exceeds balance');
+            ).to.be.revertedWith('ERC20: Transfer amount exceeds balance');
         });
 
         it('Should fail when scheduler has insufficient balance', async () => {
@@ -1308,7 +1308,7 @@ describe('IexecPocoBoost', function () {
             await signOrders(domain, orders, ordersActors);
             await expect(
                 iexecPocoBoostInstance.matchOrdersBoost(...orders.toArray()),
-            ).to.be.revertedWith('IexecEscrow: Transfer amount exceeds balance');
+            ).to.be.revertedWith('ERC20: Transfer amount exceeds balance');
         });
         it('Should fail when sponsor has insufficient balance', async () => {
             const dealPrice = (appPrice + datasetPrice + workerpoolPrice) * volume;
@@ -1327,7 +1327,7 @@ describe('IexecPocoBoost', function () {
                 iexecPocoBoostInstance
                     .connect(sponsor)
                     .sponsorMatchOrdersBoost(...orders.toArray()),
-            ).to.be.revertedWith('IexecEscrow: Transfer amount exceeds balance');
+            ).to.be.revertedWith('ERC20: Transfer amount exceeds balance');
         });
     });
 

From caecad33212cacfb59cfa76cd368bca2baee9e45 Mon Sep 17 00:00:00 2001
From: Zied <26070035+zguesmi@users.noreply.github.com>
Date: Wed, 2 Sep 2026 11:30:33 +0200
Subject: [PATCH 17/17] chore: update docs and uml

---
 contracts/facets/IexecEscrowTokenFacet.sol |    1 -
 docs/solidity/index.md                     |   36 +-
 docs/uml/class-uml-IexecEscrows.svg        |  942 +++++++-------
 docs/uml/class-uml-IexecPocoBoostFacet.svg | 1087 ++++++++--------
 docs/uml/class-uml-IexecPocoFacets.svg     | 1349 ++++++++++----------
 docs/uml/class-uml-dir-facets.svg          |   53 +-
 docs/uml/class-uml-dir-libs.svg            | 1063 +++++++--------
 7 files changed, 2324 insertions(+), 2207 deletions(-)

diff --git a/contracts/facets/IexecEscrowTokenFacet.sol b/contracts/facets/IexecEscrowTokenFacet.sol
index 54a45a5e5..2944e8dea 100644
--- a/contracts/facets/IexecEscrowTokenFacet.sol
+++ b/contracts/facets/IexecEscrowTokenFacet.sol
@@ -4,7 +4,6 @@
 pragma solidity ^0.8.0;
 
 import {FacetBase} from "../abstract/FacetBase.sol";
-import {EscrowLib} from "../libs/EscrowLib.sol";
 import {StakedRlcLib} from "../libs/StakedRlcLib.sol";
 import {IexecEscrowToken} from "../interfaces/IexecEscrowToken.sol";
 import {IexecTokenSpender} from "../interfaces/IexecTokenSpender.sol";
diff --git a/docs/solidity/index.md b/docs/solidity/index.md
index 5a7936282..7cbd1227b 100644
--- a/docs/solidity/index.md
+++ b/docs/solidity/index.md
@@ -795,18 +795,11 @@ function broadcastRequestOrder(struct IexecLibOrders_v5.RequestOrder _requestord
 
 ## EscrowLib
 
-_The events are declared here rather than taken from {IexecEscrowEvents}
-because solc 0.8.21 cannot compile a qualified `emit Other.Event(...)` when
-userdoc is requested, and docgen always requests it. A library publishes an
-event in the ABI of every contract that emits it along an inlined path, so
-{IexecEscrowEvents} stays as the single declaration feeding the aggregate
-interface._
-
-### Transfer
+The escrow layers on top of the sRLC ledger: it owns `m_frozens` and
+defers every balance move to {StakedRlcLib}.
 
-```solidity
-event Transfer(address from, address to, uint256 value)
-```
+_The events are declared here rather than taken from {IexecEscrowEvents}
+because solc 0.8.21 cannot compile `emit Other.Event(...)`._
 
 ### Reward
 
@@ -1297,6 +1290,27 @@ struct PocoStorage {
 }
 ```
 
+## StakedRlcLib
+
+sRLC ("Staked RLC") is the internal token of the PoCo protocol. It is
+not a standalone contract: its total supply, balances and allowances live in
+the PoCo storage. This library is the single owner of every write to them.
+
+_The events are declared here rather than taken from {IexecEscrowEvents}
+because solc 0.8.21 cannot compile `emit Other.Event(...)`._
+
+### Transfer
+
+```solidity
+event Transfer(address from, address to, uint256 value)
+```
+
+### Approval
+
+```solidity
+event Approval(address owner, address spender, uint256 value)
+```
+
 ## IRegistry
 
 ### isRegistered
diff --git a/docs/uml/class-uml-IexecEscrows.svg b/docs/uml/class-uml-IexecEscrows.svg
index 0e3177c4d..25eb235b6 100644
--- a/docs/uml/class-uml-IexecEscrows.svg
+++ b/docs/uml/class-uml-IexecEscrows.svg
@@ -4,708 +4,716 @@
 <!-- Generated by graphviz version 5.0.0 (20220707.1540)
  -->
 <!-- Title: UmlClassDiagram Pages: 1 -->
-<svg width="2763pt" height="2160pt"
- viewBox="0.00 0.00 2763.41 2160.20" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 2156.2)">
+<svg width="3102pt" height="2110pt"
+ viewBox="0.00 0.00 3101.59 2109.80" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 2105.8)">
 <title>UmlClassDiagram</title>
-<polygon fill="white" stroke="transparent" points="-4,4 -4,-2156.2 2759.41,-2156.2 2759.41,4 -4,4"/>
+<polygon fill="white" stroke="transparent" points="-4,4 -4,-2105.8 3097.59,-2105.8 3097.59,4 -4,4"/>
 <!-- 3 -->
 <g id="node1" class="node">
 <title>3</title>
-<polygon fill="#f2f2f2" stroke="black" points="19.08,-494.7 19.08,-804.3 328.28,-804.3 328.28,-494.7 19.08,-494.7"/>
-<text text-anchor="middle" x="173.68" y="-787.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Abstract&gt;&gt;</text>
-<text text-anchor="middle" x="173.68" y="-770.9" font-family="Times,serif" font-size="14.00">FacetBase</text>
-<text text-anchor="middle" x="173.68" y="-754.1" font-family="Times,serif" font-size="14.00">contracts/abstract/FacetBase.sol</text>
-<polyline fill="none" stroke="black" points="19.08,-745.9 328.28,-745.9 "/>
-<text text-anchor="start" x="27.08" y="-729.3" font-family="Times,serif" font-size="14.00">Internal:</text>
-<text text-anchor="start" x="27.08" y="-712.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;CONTRIBUTION_DEADLINE_RATIO: uint256</text>
-<text text-anchor="start" x="27.08" y="-695.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;REVEAL_DEADLINE_RATIO: uint256</text>
-<text text-anchor="start" x="27.08" y="-678.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;FINAL_DEADLINE_RATIO: uint256</text>
-<text text-anchor="start" x="27.08" y="-662.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;WORKERPOOL_STAKE_RATIO: uint256</text>
-<text text-anchor="start" x="27.08" y="-645.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;KITTY_RATIO: uint256</text>
-<text text-anchor="start" x="27.08" y="-628.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;KITTY_MIN: uint256</text>
-<text text-anchor="start" x="27.08" y="-611.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;KITTY_ADDRESS: address</text>
-<text text-anchor="start" x="27.08" y="-594.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;GROUPMEMBER_PURPOSE: uint256</text>
-<polyline fill="none" stroke="black" points="19.08,-586.7 328.28,-586.7 "/>
-<text text-anchor="start" x="27.08" y="-570.1" font-family="Times,serif" font-size="14.00">Internal:</text>
-<text text-anchor="start" x="27.08" y="-553.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;owner(): address</text>
-<text text-anchor="start" x="27.08" y="-536.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_msgSender(): address</text>
-<text text-anchor="start" x="27.08" y="-519.7" font-family="Times,serif" font-size="14.00">Public:</text>
-<text text-anchor="start" x="27.08" y="-502.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;modifier&gt;&gt; onlyOwner()</text>
+<polygon fill="#f2f2f2" stroke="black" points="1715.36,-444.3 1715.36,-753.9 2024.55,-753.9 2024.55,-444.3 1715.36,-444.3"/>
+<text text-anchor="middle" x="1869.95" y="-737.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Abstract&gt;&gt;</text>
+<text text-anchor="middle" x="1869.95" y="-720.5" font-family="Times,serif" font-size="14.00">FacetBase</text>
+<text text-anchor="middle" x="1869.95" y="-703.7" font-family="Times,serif" font-size="14.00">contracts/abstract/FacetBase.sol</text>
+<polyline fill="none" stroke="black" points="1715.36,-695.5 2024.55,-695.5 "/>
+<text text-anchor="start" x="1723.36" y="-678.9" font-family="Times,serif" font-size="14.00">Internal:</text>
+<text text-anchor="start" x="1723.36" y="-662.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;CONTRIBUTION_DEADLINE_RATIO: uint256</text>
+<text text-anchor="start" x="1723.36" y="-645.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;REVEAL_DEADLINE_RATIO: uint256</text>
+<text text-anchor="start" x="1723.36" y="-628.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;FINAL_DEADLINE_RATIO: uint256</text>
+<text text-anchor="start" x="1723.36" y="-611.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;WORKERPOOL_STAKE_RATIO: uint256</text>
+<text text-anchor="start" x="1723.36" y="-594.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;KITTY_RATIO: uint256</text>
+<text text-anchor="start" x="1723.36" y="-578.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;KITTY_MIN: uint256</text>
+<text text-anchor="start" x="1723.36" y="-561.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;KITTY_ADDRESS: address</text>
+<text text-anchor="start" x="1723.36" y="-544.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;GROUPMEMBER_PURPOSE: uint256</text>
+<polyline fill="none" stroke="black" points="1715.36,-536.3 2024.55,-536.3 "/>
+<text text-anchor="start" x="1723.36" y="-519.7" font-family="Times,serif" font-size="14.00">Internal:</text>
+<text text-anchor="start" x="1723.36" y="-502.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;owner(): address</text>
+<text text-anchor="start" x="1723.36" y="-486.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_msgSender(): address</text>
+<text text-anchor="start" x="1723.36" y="-469.3" font-family="Times,serif" font-size="14.00">Public:</text>
+<text text-anchor="start" x="1723.36" y="-452.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;modifier&gt;&gt; onlyOwner()</text>
 </g>
 <!-- 8 -->
 <g id="node2" class="node">
 <title>8</title>
-<polygon fill="#f2f2f2" stroke="black" points="679.33,-0.5 679.33,-453.3 1184.03,-453.3 1184.03,-0.5 679.33,-0.5"/>
-<text text-anchor="middle" x="931.68" y="-436.7" font-family="Times,serif" font-size="14.00">IexecEscrowTokenFacet</text>
-<text text-anchor="middle" x="931.68" y="-419.9" font-family="Times,serif" font-size="14.00">contracts/facets/IexecEscrowTokenFacet.sol</text>
-<polyline fill="none" stroke="black" points="679.33,-411.7 1184.03,-411.7 "/>
-<text text-anchor="start" x="687.33" y="-395.1" font-family="Times,serif" font-size="14.00">Internal:</text>
-<text text-anchor="start" x="687.33" y="-378.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_executeOperation(sender: address, data: bytes)</text>
-<text text-anchor="start" x="687.33" y="-361.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_validateMatchOrders(sender: address, data: bytes)</text>
-<text text-anchor="start" x="687.33" y="-344.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_deposit(from: address, amount: uint256)</text>
-<text text-anchor="start" x="687.33" y="-327.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_withdraw(to: address, amount: uint256)</text>
-<text text-anchor="start" x="687.33" y="-311.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_mint(account: address, amount: uint256)</text>
-<text text-anchor="start" x="687.33" y="-294.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_burn(account: address, amount: uint256)</text>
-<text text-anchor="start" x="687.33" y="-277.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_approve(owner: address, spender: address, amount: uint256)</text>
-<text text-anchor="start" x="687.33" y="-260.7" font-family="Times,serif" font-size="14.00">External:</text>
-<text text-anchor="start" x="687.33" y="-243.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;payable&gt;&gt; null()</text>
-<text text-anchor="start" x="687.33" y="-227.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;payable&gt;&gt; null()</text>
-<text text-anchor="start" x="687.33" y="-210.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;deposit(amount: uint256): bool</text>
-<text text-anchor="start" x="687.33" y="-193.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;depositFor(amount: uint256, target: address): bool</text>
-<text text-anchor="start" x="687.33" y="-176.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;depositForArray(amounts: uint256[], targets: address[]): bool</text>
-<text text-anchor="start" x="687.33" y="-159.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;withdraw(amount: uint256): bool</text>
-<text text-anchor="start" x="687.33" y="-143.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;withdrawTo(amount: uint256, target: address): bool</text>
-<text text-anchor="start" x="687.33" y="-126.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;recover(): uint256 &lt;&lt;onlyOwner&gt;&gt;</text>
-<text text-anchor="start" x="687.33" y="-109.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;receiveApproval(sender: address, amount: uint256, token: address, data: bytes): bool</text>
-<text text-anchor="start" x="687.33" y="-92.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;transfer(recipient: address, amount: uint256): bool</text>
-<text text-anchor="start" x="687.33" y="-75.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;approve(spender: address, value: uint256): bool</text>
-<text text-anchor="start" x="687.33" y="-59.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;approveAndCall(spender: address, value: uint256, extraData: bytes): bool</text>
-<text text-anchor="start" x="687.33" y="-42.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;transferFrom(sender: address, recipient: address, amount: uint256): bool</text>
-<text text-anchor="start" x="687.33" y="-25.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;increaseAllowance(spender: address, addedValue: uint256): bool</text>
-<text text-anchor="start" x="687.33" y="-8.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;decreaseAllowance(spender: address, subtractedValue: uint256): bool</text>
+<polygon fill="#f2f2f2" stroke="black" points="1617.6,-0.5 1617.6,-402.9 2122.3,-402.9 2122.3,-0.5 1617.6,-0.5"/>
+<text text-anchor="middle" x="1869.95" y="-386.3" font-family="Times,serif" font-size="14.00">IexecEscrowTokenFacet</text>
+<text text-anchor="middle" x="1869.95" y="-369.5" font-family="Times,serif" font-size="14.00">contracts/facets/IexecEscrowTokenFacet.sol</text>
+<polyline fill="none" stroke="black" points="1617.6,-361.3 2122.3,-361.3 "/>
+<text text-anchor="start" x="1625.6" y="-344.7" font-family="Times,serif" font-size="14.00">Internal:</text>
+<text text-anchor="start" x="1625.6" y="-327.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_executeOperation(sender: address, data: bytes)</text>
+<text text-anchor="start" x="1625.6" y="-311.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_validateMatchOrders(sender: address, data: bytes)</text>
+<text text-anchor="start" x="1625.6" y="-294.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_deposit(from: address, amount: uint256)</text>
+<text text-anchor="start" x="1625.6" y="-277.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_withdraw(to: address, amount: uint256)</text>
+<text text-anchor="start" x="1625.6" y="-260.7" font-family="Times,serif" font-size="14.00">External:</text>
+<text text-anchor="start" x="1625.6" y="-243.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;payable&gt;&gt; null()</text>
+<text text-anchor="start" x="1625.6" y="-227.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;payable&gt;&gt; null()</text>
+<text text-anchor="start" x="1625.6" y="-210.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;deposit(amount: uint256): bool</text>
+<text text-anchor="start" x="1625.6" y="-193.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;depositFor(amount: uint256, target: address): bool</text>
+<text text-anchor="start" x="1625.6" y="-176.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;depositForArray(amounts: uint256[], targets: address[]): bool</text>
+<text text-anchor="start" x="1625.6" y="-159.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;withdraw(amount: uint256): bool</text>
+<text text-anchor="start" x="1625.6" y="-143.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;withdrawTo(amount: uint256, target: address): bool</text>
+<text text-anchor="start" x="1625.6" y="-126.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;recover(): uint256 &lt;&lt;onlyOwner&gt;&gt;</text>
+<text text-anchor="start" x="1625.6" y="-109.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;receiveApproval(sender: address, amount: uint256, token: address, data: bytes): bool</text>
+<text text-anchor="start" x="1625.6" y="-92.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;transfer(recipient: address, amount: uint256): bool</text>
+<text text-anchor="start" x="1625.6" y="-75.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;approve(spender: address, value: uint256): bool</text>
+<text text-anchor="start" x="1625.6" y="-59.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;approveAndCall(spender: address, value: uint256, extraData: bytes): bool</text>
+<text text-anchor="start" x="1625.6" y="-42.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;transferFrom(sender: address, recipient: address, amount: uint256): bool</text>
+<text text-anchor="start" x="1625.6" y="-25.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;increaseAllowance(spender: address, addedValue: uint256): bool</text>
+<text text-anchor="start" x="1625.6" y="-8.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;decreaseAllowance(spender: address, subtractedValue: uint256): bool</text>
 </g>
 <!-- 8&#45;&gt;3 -->
 <g id="edge3" class="edge">
 <title>8&#45;&gt;3</title>
-<path fill="none" stroke="black" d="M679.07,-316.25C577.52,-357.06 461.04,-410.71 353.62,-479.65"/>
-<polygon fill="none" stroke="black" points="347.63,-471.02 328.33,-496.28 359.17,-488.57 347.63,-471.02"/>
+<path fill="none" stroke="black" d="M1869.95,-403.01C1869.95,-406.67 1869.95,-410.32 1869.95,-413.98"/>
+<polygon fill="none" stroke="black" points="1859.45,-414.02 1869.95,-444.02 1880.45,-414.02 1859.45,-414.02"/>
 </g>
 <!-- 23 -->
-<g id="node4" class="node">
+<g id="node3" class="node">
 <title>23</title>
-<polygon fill="#f2f2f2" stroke="black" points="346.71,-490.3 346.71,-808.7 642.66,-808.7 642.66,-490.3 346.71,-490.3"/>
-<text text-anchor="middle" x="494.68" y="-792.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
-<text text-anchor="middle" x="494.68" y="-775.3" font-family="Times,serif" font-size="14.00">IexecEscrowToken</text>
-<text text-anchor="middle" x="494.68" y="-758.5" font-family="Times,serif" font-size="14.00">contracts/interfaces/IexecEscrowToken.sol</text>
-<polyline fill="none" stroke="black" points="346.71,-750.3 642.66,-750.3 "/>
-<text text-anchor="start" x="354.71" y="-733.7" font-family="Times,serif" font-size="14.00">External:</text>
-<text text-anchor="start" x="354.71" y="-716.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;null()</text>
-<text text-anchor="start" x="354.71" y="-700.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;null()</text>
-<text text-anchor="start" x="354.71" y="-683.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;deposit(uint256): bool</text>
-<text text-anchor="start" x="354.71" y="-666.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;depositFor(uint256, address): bool</text>
-<text text-anchor="start" x="354.71" y="-649.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;depositForArray(uint256[], address[]): bool</text>
-<text text-anchor="start" x="354.71" y="-632.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;withdraw(uint256): bool</text>
-<text text-anchor="start" x="354.71" y="-616.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;withdrawTo(uint256, address): bool</text>
-<text text-anchor="start" x="354.71" y="-599.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;recover(): uint256</text>
-<text text-anchor="start" x="354.71" y="-582.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;transfer(address, uint256): bool</text>
-<text text-anchor="start" x="354.71" y="-565.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;approve(address, uint256): bool</text>
-<text text-anchor="start" x="354.71" y="-548.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;transferFrom(address, address, uint256): bool</text>
-<text text-anchor="start" x="354.71" y="-532.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;increaseAllowance(address, uint256): bool</text>
-<text text-anchor="start" x="354.71" y="-515.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;decreaseAllowance(address, uint256): bool</text>
-<text text-anchor="start" x="354.71" y="-498.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;approveAndCall(address, uint256, bytes): bool</text>
+<polygon fill="#f2f2f2" stroke="black" points="2042.98,-439.9 2042.98,-758.3 2338.93,-758.3 2338.93,-439.9 2042.98,-439.9"/>
+<text text-anchor="middle" x="2190.95" y="-741.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
+<text text-anchor="middle" x="2190.95" y="-724.9" font-family="Times,serif" font-size="14.00">IexecEscrowToken</text>
+<text text-anchor="middle" x="2190.95" y="-708.1" font-family="Times,serif" font-size="14.00">contracts/interfaces/IexecEscrowToken.sol</text>
+<polyline fill="none" stroke="black" points="2042.98,-699.9 2338.93,-699.9 "/>
+<text text-anchor="start" x="2050.98" y="-683.3" font-family="Times,serif" font-size="14.00">External:</text>
+<text text-anchor="start" x="2050.98" y="-666.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;null()</text>
+<text text-anchor="start" x="2050.98" y="-649.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;null()</text>
+<text text-anchor="start" x="2050.98" y="-632.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;deposit(uint256): bool</text>
+<text text-anchor="start" x="2050.98" y="-616.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;depositFor(uint256, address): bool</text>
+<text text-anchor="start" x="2050.98" y="-599.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;depositForArray(uint256[], address[]): bool</text>
+<text text-anchor="start" x="2050.98" y="-582.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;withdraw(uint256): bool</text>
+<text text-anchor="start" x="2050.98" y="-565.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;withdrawTo(uint256, address): bool</text>
+<text text-anchor="start" x="2050.98" y="-548.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;recover(): uint256</text>
+<text text-anchor="start" x="2050.98" y="-532.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;transfer(address, uint256): bool</text>
+<text text-anchor="start" x="2050.98" y="-515.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;approve(address, uint256): bool</text>
+<text text-anchor="start" x="2050.98" y="-498.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;transferFrom(address, address, uint256): bool</text>
+<text text-anchor="start" x="2050.98" y="-481.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;increaseAllowance(address, uint256): bool</text>
+<text text-anchor="start" x="2050.98" y="-464.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;decreaseAllowance(address, uint256): bool</text>
+<text text-anchor="start" x="2050.98" y="-448.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;approveAndCall(address, uint256, bytes): bool</text>
 </g>
 <!-- 8&#45;&gt;23 -->
 <g id="edge1" class="edge">
 <title>8&#45;&gt;23</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M694.47,-453.41C685.87,-461.67 677.33,-469.88 664.74,-482.03"/>
-<polygon fill="none" stroke="black" points="657.19,-474.73 642.91,-503.12 671.79,-489.83 657.19,-474.73"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2032.57,-403.01C2036.17,-407.44 2039.77,-411.88 2043.36,-416.3"/>
+<polygon fill="none" stroke="black" points="2035.38,-423.13 2062.44,-439.8 2051.68,-409.89 2035.38,-423.13"/>
 </g>
 <!-- 26 -->
-<g id="node6" class="node">
+<g id="node5" class="node">
 <title>26</title>
-<polygon fill="#f2f2f2" stroke="black" points="698.19,-523.9 698.19,-775.1 1689.17,-775.1 1689.17,-523.9 698.19,-523.9"/>
-<text text-anchor="middle" x="1193.68" y="-758.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
-<text text-anchor="middle" x="1193.68" y="-741.7" font-family="Times,serif" font-size="14.00">IexecPoco1</text>
-<text text-anchor="middle" x="1193.68" y="-724.9" font-family="Times,serif" font-size="14.00">contracts/interfaces/IexecPoco1.sol</text>
-<polyline fill="none" stroke="black" points="698.19,-716.7 1689.17,-716.7 "/>
-<text text-anchor="start" x="706.19" y="-700.1" font-family="Times,serif" font-size="14.00">External:</text>
-<text text-anchor="start" x="706.19" y="-683.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;verifySignature(address, bytes32, bytes): bool</text>
-<text text-anchor="start" x="706.19" y="-666.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;verifyPresignature(address, bytes32): bool</text>
-<text text-anchor="start" x="706.19" y="-649.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;verifyPresignatureOrSignature(address, bytes32, bytes): bool</text>
-<text text-anchor="start" x="706.19" y="-632.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;assertDatasetDealCompatibility(datasetOrder: IexecLibOrders_v5.DatasetOrder, dealId: bytes32)</text>
-<text text-anchor="start" x="706.19" y="-616.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;matchOrders(IexecLibOrders_v5.AppOrder, IexecLibOrders_v5.DatasetOrder, IexecLibOrders_v5.WorkerpoolOrder, IexecLibOrders_v5.RequestOrder): bytes32</text>
-<text text-anchor="start" x="706.19" y="-599.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;sponsorMatchOrders(IexecLibOrders_v5.AppOrder, IexecLibOrders_v5.DatasetOrder, IexecLibOrders_v5.WorkerpoolOrder, IexecLibOrders_v5.RequestOrder): bytes32</text>
-<text text-anchor="start" x="706.19" y="-582.5" font-family="Times,serif" font-size="14.00">Public:</text>
-<text text-anchor="start" x="706.19" y="-565.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; SchedulerNotice(workerpool: address, dealid: bytes32)</text>
-<text text-anchor="start" x="706.19" y="-548.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; OrdersMatched(dealid: bytes32, appHash: bytes32, datasetHash: bytes32, workerpoolHash: bytes32, requestHash: bytes32, volume: uint256)</text>
-<text text-anchor="start" x="706.19" y="-532.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; DealSponsored(dealId: bytes32, sponsor: address)</text>
+<polygon fill="#f2f2f2" stroke="black" points="706.46,-473.5 706.46,-724.7 1697.45,-724.7 1697.45,-473.5 706.46,-473.5"/>
+<text text-anchor="middle" x="1201.95" y="-708.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
+<text text-anchor="middle" x="1201.95" y="-691.3" font-family="Times,serif" font-size="14.00">IexecPoco1</text>
+<text text-anchor="middle" x="1201.95" y="-674.5" font-family="Times,serif" font-size="14.00">contracts/interfaces/IexecPoco1.sol</text>
+<polyline fill="none" stroke="black" points="706.46,-666.3 1697.45,-666.3 "/>
+<text text-anchor="start" x="714.46" y="-649.7" font-family="Times,serif" font-size="14.00">External:</text>
+<text text-anchor="start" x="714.46" y="-632.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;verifySignature(address, bytes32, bytes): bool</text>
+<text text-anchor="start" x="714.46" y="-616.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;verifyPresignature(address, bytes32): bool</text>
+<text text-anchor="start" x="714.46" y="-599.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;verifyPresignatureOrSignature(address, bytes32, bytes): bool</text>
+<text text-anchor="start" x="714.46" y="-582.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;assertDatasetDealCompatibility(datasetOrder: IexecLibOrders_v5.DatasetOrder, dealId: bytes32)</text>
+<text text-anchor="start" x="714.46" y="-565.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;matchOrders(IexecLibOrders_v5.AppOrder, IexecLibOrders_v5.DatasetOrder, IexecLibOrders_v5.WorkerpoolOrder, IexecLibOrders_v5.RequestOrder): bytes32</text>
+<text text-anchor="start" x="714.46" y="-548.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;sponsorMatchOrders(IexecLibOrders_v5.AppOrder, IexecLibOrders_v5.DatasetOrder, IexecLibOrders_v5.WorkerpoolOrder, IexecLibOrders_v5.RequestOrder): bytes32</text>
+<text text-anchor="start" x="714.46" y="-532.1" font-family="Times,serif" font-size="14.00">Public:</text>
+<text text-anchor="start" x="714.46" y="-515.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; SchedulerNotice(workerpool: address, dealid: bytes32)</text>
+<text text-anchor="start" x="714.46" y="-498.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; OrdersMatched(dealid: bytes32, appHash: bytes32, datasetHash: bytes32, workerpoolHash: bytes32, requestHash: bytes32, volume: uint256)</text>
+<text text-anchor="start" x="714.46" y="-481.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; DealSponsored(dealId: bytes32, sponsor: address)</text>
 </g>
 <!-- 8&#45;&gt;26 -->
-<g id="edge6" class="edge">
+<g id="edge7" class="edge">
 <title>8&#45;&gt;26</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1072.27,-453.59C1085.33,-474.56 1098.26,-495.32 1110.54,-515.03"/>
-<polygon fill="black" stroke="black" points="1107.69,-517.07 1115.95,-523.71 1113.63,-513.37 1107.69,-517.07"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1617.41,-352.18C1552.93,-390.35 1484.12,-431.08 1421.44,-468.18"/>
+<polygon fill="black" stroke="black" points="1419.46,-465.28 1412.64,-473.39 1423.03,-471.31 1419.46,-465.28"/>
 </g>
 <!-- 33 -->
-<g id="node7" class="node">
+<g id="node6" class="node">
 <title>33</title>
-<polygon fill="#f2f2f2" stroke="black" points="1706.84,-599.5 1706.84,-699.5 2052.53,-699.5 2052.53,-599.5 1706.84,-599.5"/>
-<text text-anchor="middle" x="1879.68" y="-682.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
-<text text-anchor="middle" x="1879.68" y="-666.1" font-family="Times,serif" font-size="14.00">IexecTokenSpender</text>
-<text text-anchor="middle" x="1879.68" y="-649.3" font-family="Times,serif" font-size="14.00">contracts/interfaces/IexecTokenSpender.sol</text>
-<polyline fill="none" stroke="black" points="1706.84,-641.1 2052.53,-641.1 "/>
-<text text-anchor="start" x="1714.84" y="-624.5" font-family="Times,serif" font-size="14.00">External:</text>
-<text text-anchor="start" x="1714.84" y="-607.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;receiveApproval(address, uint256, address, bytes): bool</text>
+<polygon fill="#f2f2f2" stroke="black" points="343.11,-549.1 343.11,-649.1 688.8,-649.1 688.8,-549.1 343.11,-549.1"/>
+<text text-anchor="middle" x="515.95" y="-632.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
+<text text-anchor="middle" x="515.95" y="-615.7" font-family="Times,serif" font-size="14.00">IexecTokenSpender</text>
+<text text-anchor="middle" x="515.95" y="-598.9" font-family="Times,serif" font-size="14.00">contracts/interfaces/IexecTokenSpender.sol</text>
+<polyline fill="none" stroke="black" points="343.11,-590.7 688.8,-590.7 "/>
+<text text-anchor="start" x="351.11" y="-574.1" font-family="Times,serif" font-size="14.00">External:</text>
+<text text-anchor="start" x="351.11" y="-557.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;receiveApproval(address, uint256, address, bytes): bool</text>
 </g>
 <!-- 8&#45;&gt;33 -->
 <g id="edge2" class="edge">
 <title>8&#45;&gt;33</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1184.07,-287.58C1338.73,-330.48 1537.14,-397.18 1697.68,-489.8 1739.03,-513.65 1779.6,-547.68 1811.91,-578.12"/>
-<polygon fill="none" stroke="black" points="1805.03,-586.07 1833.86,-599.45 1819.66,-571.01 1805.03,-586.07"/>
-</g>
-<!-- 35 -->
-<g id="node8" class="node">
-<title>35</title>
-<polygon fill="#f2f2f2" stroke="black" points="2109.05,-507.1 2109.05,-791.9 2514.31,-791.9 2514.31,-507.1 2109.05,-507.1"/>
-<text text-anchor="middle" x="2311.68" y="-775.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
-<text text-anchor="middle" x="2311.68" y="-758.5" font-family="Times,serif" font-size="14.00">EscrowLib</text>
-<text text-anchor="middle" x="2311.68" y="-741.7" font-family="Times,serif" font-size="14.00">contracts/libs/EscrowLib.sol</text>
-<polyline fill="none" stroke="black" points="2109.05,-733.5 2514.31,-733.5 "/>
-<text text-anchor="start" x="2117.05" y="-716.9" font-family="Times,serif" font-size="14.00">Internal:</text>
-<text text-anchor="start" x="2117.05" y="-700.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;lock(account: address, value: uint256)</text>
-<text text-anchor="start" x="2117.05" y="-683.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;unlock(account: address, value: uint256)</text>
-<text text-anchor="start" x="2117.05" y="-666.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;reward(account: address, value: uint256, ref: bytes32)</text>
-<text text-anchor="start" x="2117.05" y="-649.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;seize(account: address, value: uint256, ref: bytes32)</text>
-<text text-anchor="start" x="2117.05" y="-632.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;rewardAndLock(account: address, value: uint256, ref: bytes32)</text>
-<text text-anchor="start" x="2117.05" y="-616.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;transfer(from: address, to: address, value: uint256)</text>
-<text text-anchor="start" x="2117.05" y="-599.3" font-family="Times,serif" font-size="14.00">Public:</text>
-<text text-anchor="start" x="2117.05" y="-582.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Transfer(from: address, to: address, value: uint256)</text>
-<text text-anchor="start" x="2117.05" y="-565.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Reward(owner: address, amount: uint256, ref: bytes32)</text>
-<text text-anchor="start" x="2117.05" y="-548.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Seize(owner: address, amount: uint256, ref: bytes32)</text>
-<text text-anchor="start" x="2117.05" y="-532.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Lock(owner: address, amount: uint256)</text>
-<text text-anchor="start" x="2117.05" y="-515.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Unlock(owner: address, amount: uint256)</text>
-</g>
-<!-- 8&#45;&gt;35 -->
-<g id="edge8" class="edge">
-<title>8&#45;&gt;35</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1184.19,-254.53C1426.39,-286.96 1798.02,-355.01 2094.68,-489.8 2103.03,-493.59 2111.37,-497.74 2119.67,-502.16"/>
-<polygon fill="black" stroke="black" points="2118.19,-505.34 2128.64,-507.06 2121.54,-499.2 2118.19,-505.34"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1617.55,-216.24C1371.69,-237.85 992.92,-293.92 697.95,-439.4 654.18,-460.99 612.57,-495.77 580.22,-527.28"/>
+<polygon fill="none" stroke="black" points="572.49,-520.16 558.89,-548.88 587.44,-534.91 572.49,-520.16"/>
 </g>
 <!-- 50 -->
-<g id="node10" class="node">
+<g id="node9" class="node">
 <title>50</title>
-<polygon fill="#f2f2f2" stroke="black" points="976.92,-845.7 976.92,-1256.1 1410.45,-1256.1 1410.45,-845.7 976.92,-845.7"/>
-<text text-anchor="middle" x="1193.68" y="-1239.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
-<text text-anchor="middle" x="1193.68" y="-1222.7" font-family="Times,serif" font-size="14.00">IexecLibOrders_v5</text>
-<text text-anchor="middle" x="1193.68" y="-1205.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="976.92,-1197.7 1410.45,-1197.7 "/>
-<text text-anchor="start" x="984.92" y="-1181.1" font-family="Times,serif" font-size="14.00">Public:</text>
-<text text-anchor="start" x="984.92" y="-1164.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;EIP712DOMAIN_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="984.92" y="-1147.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;APPORDER_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="984.92" y="-1130.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;DATASETORDER_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="984.92" y="-1113.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;WORKERPOOLORDER_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="984.92" y="-1097.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;REQUESTORDER_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="984.92" y="-1080.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;APPORDEROPERATION_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="984.92" y="-1063.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;DATASETORDEROPERATION_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="984.92" y="-1046.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;WORKERPOOLORDEROPERATION_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="984.92" y="-1029.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;REQUESTORDEROPERATION_TYPEHASH: bytes32</text>
-<polyline fill="none" stroke="black" points="976.92,-1021.7 1410.45,-1021.7 "/>
-<text text-anchor="start" x="984.92" y="-1005.1" font-family="Times,serif" font-size="14.00">Public:</text>
-<text text-anchor="start" x="984.92" y="-988.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_domain: EIP712Domain): (domainhash: bytes32)</text>
-<text text-anchor="start" x="984.92" y="-971.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_apporder: AppOrder): (apphash: bytes32)</text>
-<text text-anchor="start" x="984.92" y="-954.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_datasetorder: DatasetOrder): (datasethash: bytes32)</text>
-<text text-anchor="start" x="984.92" y="-937.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_workerpoolorder: WorkerpoolOrder): (workerpoolhash: bytes32)</text>
-<text text-anchor="start" x="984.92" y="-921.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_requestorder: RequestOrder): (requesthash: bytes32)</text>
-<text text-anchor="start" x="984.92" y="-904.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_apporderoperation: AppOrderOperation): bytes32</text>
-<text text-anchor="start" x="984.92" y="-887.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_datasetorderoperation: DatasetOrderOperation): bytes32</text>
-<text text-anchor="start" x="984.92" y="-870.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_workerpoolorderoperation: WorkerpoolOrderOperation): bytes32</text>
-<text text-anchor="start" x="984.92" y="-853.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_requestorderoperation: RequestOrderOperation): bytes32</text>
+<polygon fill="#f2f2f2" stroke="black" points="598.19,-795.3 598.19,-1205.7 1031.72,-1205.7 1031.72,-795.3 598.19,-795.3"/>
+<text text-anchor="middle" x="814.95" y="-1189.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
+<text text-anchor="middle" x="814.95" y="-1172.3" font-family="Times,serif" font-size="14.00">IexecLibOrders_v5</text>
+<text text-anchor="middle" x="814.95" y="-1155.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="598.19,-1147.3 1031.72,-1147.3 "/>
+<text text-anchor="start" x="606.19" y="-1130.7" font-family="Times,serif" font-size="14.00">Public:</text>
+<text text-anchor="start" x="606.19" y="-1113.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;EIP712DOMAIN_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="606.19" y="-1097.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;APPORDER_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="606.19" y="-1080.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;DATASETORDER_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="606.19" y="-1063.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;WORKERPOOLORDER_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="606.19" y="-1046.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;REQUESTORDER_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="606.19" y="-1029.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;APPORDEROPERATION_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="606.19" y="-1013.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;DATASETORDEROPERATION_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="606.19" y="-996.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;WORKERPOOLORDEROPERATION_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="606.19" y="-979.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;REQUESTORDEROPERATION_TYPEHASH: bytes32</text>
+<polyline fill="none" stroke="black" points="598.19,-971.3 1031.72,-971.3 "/>
+<text text-anchor="start" x="606.19" y="-954.7" font-family="Times,serif" font-size="14.00">Public:</text>
+<text text-anchor="start" x="606.19" y="-937.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_domain: EIP712Domain): (domainhash: bytes32)</text>
+<text text-anchor="start" x="606.19" y="-921.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_apporder: AppOrder): (apphash: bytes32)</text>
+<text text-anchor="start" x="606.19" y="-904.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_datasetorder: DatasetOrder): (datasethash: bytes32)</text>
+<text text-anchor="start" x="606.19" y="-887.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_workerpoolorder: WorkerpoolOrder): (workerpoolhash: bytes32)</text>
+<text text-anchor="start" x="606.19" y="-870.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_requestorder: RequestOrder): (requesthash: bytes32)</text>
+<text text-anchor="start" x="606.19" y="-853.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_apporderoperation: AppOrderOperation): bytes32</text>
+<text text-anchor="start" x="606.19" y="-837.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_datasetorderoperation: DatasetOrderOperation): bytes32</text>
+<text text-anchor="start" x="606.19" y="-820.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_workerpoolorderoperation: WorkerpoolOrderOperation): bytes32</text>
+<text text-anchor="start" x="606.19" y="-803.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_requestorderoperation: RequestOrderOperation): bytes32</text>
 </g>
 <!-- 8&#45;&gt;50 -->
-<g id="edge7" class="edge">
+<g id="edge8" class="edge">
 <title>8&#45;&gt;50</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M706.72,-453.37C700.27,-465.24 694.53,-477.4 689.68,-489.8 663.82,-555.9 651.82,-749.16 689.68,-809.2 751.06,-906.53 863.84,-965.35 967.17,-1000.44"/>
-<polygon fill="black" stroke="black" points="966.22,-1003.82 976.82,-1003.66 968.44,-997.18 966.22,-1003.82"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1617.35,-203.53C1224.75,-210.79 496.27,-250.15 333.95,-439.4 241.54,-547.15 259.34,-638.03 333.95,-758.8 390.24,-849.9 492.62,-907.69 588.51,-943.72"/>
+<polygon fill="black" stroke="black" points="587.47,-947.07 598.06,-947.25 589.89,-940.5 587.47,-947.07"/>
 </g>
 <!-- 61 -->
-<g id="node21" class="node">
+<g id="node20" class="node">
 <title>61</title>
-<polygon fill="#f2f2f2" stroke="black" points="2269.24,-980.1 2269.24,-1121.7 2534.13,-1121.7 2534.13,-980.1 2269.24,-980.1"/>
-<text text-anchor="middle" x="2401.68" y="-1105.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
-<text text-anchor="middle" x="2401.68" y="-1088.3" font-family="Times,serif" font-size="14.00">PocoStorageLib</text>
-<text text-anchor="middle" x="2401.68" y="-1071.5" font-family="Times,serif" font-size="14.00">contracts/libs/PocoStorageLib.sol</text>
-<polyline fill="none" stroke="black" points="2269.24,-1063.3 2534.13,-1063.3 "/>
-<text text-anchor="start" x="2277.24" y="-1046.7" font-family="Times,serif" font-size="14.00">Private:</text>
-<text text-anchor="start" x="2277.24" y="-1029.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;POCO_STORAGE_LOCATION: bytes32</text>
-<polyline fill="none" stroke="black" points="2269.24,-1021.7 2534.13,-1021.7 "/>
-<text text-anchor="start" x="2277.24" y="-1005.1" font-family="Times,serif" font-size="14.00">Internal:</text>
-<text text-anchor="start" x="2277.24" y="-988.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;getPocoStorage(): ($: PocoStorage)</text>
+<polygon fill="#f2f2f2" stroke="black" points="2455.51,-929.7 2455.51,-1071.3 2720.4,-1071.3 2720.4,-929.7 2455.51,-929.7"/>
+<text text-anchor="middle" x="2587.95" y="-1054.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
+<text text-anchor="middle" x="2587.95" y="-1037.9" font-family="Times,serif" font-size="14.00">PocoStorageLib</text>
+<text text-anchor="middle" x="2587.95" y="-1021.1" font-family="Times,serif" font-size="14.00">contracts/libs/PocoStorageLib.sol</text>
+<polyline fill="none" stroke="black" points="2455.51,-1012.9 2720.4,-1012.9 "/>
+<text text-anchor="start" x="2463.51" y="-996.3" font-family="Times,serif" font-size="14.00">Private:</text>
+<text text-anchor="start" x="2463.51" y="-979.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;POCO_STORAGE_LOCATION: bytes32</text>
+<polyline fill="none" stroke="black" points="2455.51,-971.3 2720.4,-971.3 "/>
+<text text-anchor="start" x="2463.51" y="-954.7" font-family="Times,serif" font-size="14.00">Internal:</text>
+<text text-anchor="start" x="2463.51" y="-937.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;getPocoStorage(): ($: PocoStorage)</text>
 </g>
 <!-- 8&#45;&gt;61 -->
-<g id="edge4" class="edge">
+<g id="edge5" class="edge">
 <title>8&#45;&gt;61</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1184.23,-231.35C1589.02,-242.81 2354.87,-290.95 2523.68,-489.8 2640.87,-627.84 2529.85,-852.59 2455.82,-971.06"/>
-<polygon fill="black" stroke="black" points="2452.71,-969.43 2450.33,-979.76 2458.63,-973.17 2452.71,-969.43"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2122.34,-263.48C2217.78,-299.14 2318.36,-354.52 2380.95,-439.4 2465.97,-554.68 2372.7,-625.05 2423.95,-758.8 2446.66,-818.04 2486.5,-877.03 2521.23,-921.79"/>
+<polygon fill="black" stroke="black" points="2518.5,-923.98 2527.42,-929.69 2524.01,-919.66 2518.5,-923.98"/>
 </g>
 <!-- 62 -->
-<g id="node22" class="node">
+<g id="node21" class="node">
 <title>62</title>
-<polygon fill="#f2f2f2" stroke="black" points="2140.71,-1293.1 2140.71,-1779.5 2662.65,-1779.5 2662.65,-1293.1 2140.71,-1293.1"/>
-<text text-anchor="middle" x="2401.68" y="-1762.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="2401.68" y="-1746.1" font-family="Times,serif" font-size="14.00">PocoStorage</text>
-<text text-anchor="middle" x="2401.68" y="-1729.3" font-family="Times,serif" font-size="14.00">contracts/libs/PocoStorageLib.sol</text>
-<polyline fill="none" stroke="black" points="2140.71,-1721.1 2662.65,-1721.1 "/>
-<text text-anchor="start" x="2148.71" y="-1704.5" font-family="Times,serif" font-size="14.00">m_appregistry: IRegistry</text>
-<text text-anchor="start" x="2148.71" y="-1687.7" font-family="Times,serif" font-size="14.00">m_datasetregistry: IRegistry</text>
-<text text-anchor="start" x="2148.71" y="-1670.9" font-family="Times,serif" font-size="14.00">m_workerpoolregistry: IRegistry</text>
-<text text-anchor="start" x="2148.71" y="-1654.1" font-family="Times,serif" font-size="14.00">m_baseToken: IERC20</text>
-<text text-anchor="start" x="2148.71" y="-1637.3" font-family="Times,serif" font-size="14.00">m_name: string</text>
-<text text-anchor="start" x="2148.71" y="-1620.5" font-family="Times,serif" font-size="14.00">m_symbol: string</text>
-<text text-anchor="start" x="2148.71" y="-1603.7" font-family="Times,serif" font-size="14.00">m_decimals: uint8</text>
-<text text-anchor="start" x="2148.71" y="-1586.9" font-family="Times,serif" font-size="14.00">m_totalSupply: uint256</text>
-<text text-anchor="start" x="2148.71" y="-1570.1" font-family="Times,serif" font-size="14.00">m_balances: mapping(address=&gt;uint256)</text>
-<text text-anchor="start" x="2148.71" y="-1553.3" font-family="Times,serif" font-size="14.00">m_frozens: mapping(address=&gt;uint256)</text>
-<text text-anchor="start" x="2148.71" y="-1536.5" font-family="Times,serif" font-size="14.00">m_allowances: mapping(address=&gt;mapping(address=&gt;uint256))</text>
-<text text-anchor="start" x="2148.71" y="-1519.7" font-family="Times,serif" font-size="14.00">m_eip712DomainSeparator: bytes32</text>
-<text text-anchor="start" x="2148.71" y="-1502.9" font-family="Times,serif" font-size="14.00">m_presigned: mapping(bytes32=&gt;address)</text>
-<text text-anchor="start" x="2148.71" y="-1486.1" font-family="Times,serif" font-size="14.00">m_consumed: mapping(bytes32=&gt;uint256)</text>
-<text text-anchor="start" x="2148.71" y="-1469.3" font-family="Times,serif" font-size="14.00">m_deals: mapping(bytes32=&gt;IexecLibCore_v5.Deal)</text>
-<text text-anchor="start" x="2148.71" y="-1452.5" font-family="Times,serif" font-size="14.00">m_tasks: mapping(bytes32=&gt;IexecLibCore_v5.Task)</text>
-<text text-anchor="start" x="2148.71" y="-1435.7" font-family="Times,serif" font-size="14.00">m_consensus: mapping(bytes32=&gt;IexecLibCore_v5.Consensus)</text>
-<text text-anchor="start" x="2148.71" y="-1418.9" font-family="Times,serif" font-size="14.00">m_contributions: mapping(bytes32=&gt;mapping(address=&gt;IexecLibCore_v5.Contribution))</text>
-<text text-anchor="start" x="2148.71" y="-1402.1" font-family="Times,serif" font-size="14.00">m_workerScores: mapping(address=&gt;uint256)</text>
-<text text-anchor="start" x="2148.71" y="-1385.3" font-family="Times,serif" font-size="14.00">m_teebroker: address</text>
-<text text-anchor="start" x="2148.71" y="-1368.5" font-family="Times,serif" font-size="14.00">m_callbackgas: uint256</text>
-<text text-anchor="start" x="2148.71" y="-1351.7" font-family="Times,serif" font-size="14.00">m_categories: IexecLibCore_v5.Category[]</text>
-<text text-anchor="start" x="2148.71" y="-1334.9" font-family="Times,serif" font-size="14.00">m_v3_iexecHub: IexecHubV3Interface</text>
-<text text-anchor="start" x="2148.71" y="-1318.1" font-family="Times,serif" font-size="14.00">m_v3_scoreImported: mapping(address=&gt;bool)</text>
-<text text-anchor="start" x="2148.71" y="-1301.3" font-family="Times,serif" font-size="14.00">m_dealsBoost: mapping(bytes32=&gt;IexecLibCore_v5.DealBoost)</text>
+<polygon fill="#f2f2f2" stroke="black" points="2326.99,-1242.7 2326.99,-1729.1 2848.92,-1729.1 2848.92,-1242.7 2326.99,-1242.7"/>
+<text text-anchor="middle" x="2587.95" y="-1712.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="2587.95" y="-1695.7" font-family="Times,serif" font-size="14.00">PocoStorage</text>
+<text text-anchor="middle" x="2587.95" y="-1678.9" font-family="Times,serif" font-size="14.00">contracts/libs/PocoStorageLib.sol</text>
+<polyline fill="none" stroke="black" points="2326.99,-1670.7 2848.92,-1670.7 "/>
+<text text-anchor="start" x="2334.99" y="-1654.1" font-family="Times,serif" font-size="14.00">m_appregistry: IRegistry</text>
+<text text-anchor="start" x="2334.99" y="-1637.3" font-family="Times,serif" font-size="14.00">m_datasetregistry: IRegistry</text>
+<text text-anchor="start" x="2334.99" y="-1620.5" font-family="Times,serif" font-size="14.00">m_workerpoolregistry: IRegistry</text>
+<text text-anchor="start" x="2334.99" y="-1603.7" font-family="Times,serif" font-size="14.00">m_baseToken: IERC20</text>
+<text text-anchor="start" x="2334.99" y="-1586.9" font-family="Times,serif" font-size="14.00">m_name: string</text>
+<text text-anchor="start" x="2334.99" y="-1570.1" font-family="Times,serif" font-size="14.00">m_symbol: string</text>
+<text text-anchor="start" x="2334.99" y="-1553.3" font-family="Times,serif" font-size="14.00">m_decimals: uint8</text>
+<text text-anchor="start" x="2334.99" y="-1536.5" font-family="Times,serif" font-size="14.00">m_totalSupply: uint256</text>
+<text text-anchor="start" x="2334.99" y="-1519.7" font-family="Times,serif" font-size="14.00">m_balances: mapping(address=&gt;uint256)</text>
+<text text-anchor="start" x="2334.99" y="-1502.9" font-family="Times,serif" font-size="14.00">m_frozens: mapping(address=&gt;uint256)</text>
+<text text-anchor="start" x="2334.99" y="-1486.1" font-family="Times,serif" font-size="14.00">m_allowances: mapping(address=&gt;mapping(address=&gt;uint256))</text>
+<text text-anchor="start" x="2334.99" y="-1469.3" font-family="Times,serif" font-size="14.00">m_eip712DomainSeparator: bytes32</text>
+<text text-anchor="start" x="2334.99" y="-1452.5" font-family="Times,serif" font-size="14.00">m_presigned: mapping(bytes32=&gt;address)</text>
+<text text-anchor="start" x="2334.99" y="-1435.7" font-family="Times,serif" font-size="14.00">m_consumed: mapping(bytes32=&gt;uint256)</text>
+<text text-anchor="start" x="2334.99" y="-1418.9" font-family="Times,serif" font-size="14.00">m_deals: mapping(bytes32=&gt;IexecLibCore_v5.Deal)</text>
+<text text-anchor="start" x="2334.99" y="-1402.1" font-family="Times,serif" font-size="14.00">m_tasks: mapping(bytes32=&gt;IexecLibCore_v5.Task)</text>
+<text text-anchor="start" x="2334.99" y="-1385.3" font-family="Times,serif" font-size="14.00">m_consensus: mapping(bytes32=&gt;IexecLibCore_v5.Consensus)</text>
+<text text-anchor="start" x="2334.99" y="-1368.5" font-family="Times,serif" font-size="14.00">m_contributions: mapping(bytes32=&gt;mapping(address=&gt;IexecLibCore_v5.Contribution))</text>
+<text text-anchor="start" x="2334.99" y="-1351.7" font-family="Times,serif" font-size="14.00">m_workerScores: mapping(address=&gt;uint256)</text>
+<text text-anchor="start" x="2334.99" y="-1334.9" font-family="Times,serif" font-size="14.00">m_teebroker: address</text>
+<text text-anchor="start" x="2334.99" y="-1318.1" font-family="Times,serif" font-size="14.00">m_callbackgas: uint256</text>
+<text text-anchor="start" x="2334.99" y="-1301.3" font-family="Times,serif" font-size="14.00">m_categories: IexecLibCore_v5.Category[]</text>
+<text text-anchor="start" x="2334.99" y="-1284.5" font-family="Times,serif" font-size="14.00">m_v3_iexecHub: IexecHubV3Interface</text>
+<text text-anchor="start" x="2334.99" y="-1267.7" font-family="Times,serif" font-size="14.00">m_v3_scoreImported: mapping(address=&gt;bool)</text>
+<text text-anchor="start" x="2334.99" y="-1250.9" font-family="Times,serif" font-size="14.00">m_dealsBoost: mapping(bytes32=&gt;IexecLibCore_v5.DealBoost)</text>
 </g>
 <!-- 8&#45;&gt;62 -->
-<g id="edge5" class="edge">
+<g id="edge6" class="edge">
 <title>8&#45;&gt;62</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1184.35,-252.9C1480.84,-287.74 1946.72,-361.53 2061.68,-489.8 2109.39,-543.03 2085.29,-739.18 2099.68,-809.2 2141.41,-1012.28 2147.65,-1067.07 2231.68,-1256.6 2235.69,-1265.63 2239.94,-1274.73 2244.38,-1283.84"/>
-<polygon fill="black" stroke="black" points="2241.31,-1285.54 2248.88,-1292.95 2247.59,-1282.44 2241.31,-1285.54"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2122.6,-272.52C2207.46,-308.61 2294.14,-361.91 2347.95,-439.4 2388.65,-498.01 2372.08,-688 2380.95,-758.8 2405.96,-958.24 2386.13,-1014.63 2446.95,-1206.2 2449.79,-1215.12 2452.88,-1224.1 2456.18,-1233.1"/>
+<polygon fill="black" stroke="black" points="2452.91,-1234.34 2459.69,-1242.48 2459.46,-1231.88 2452.91,-1234.34"/>
 </g>
-<!-- 22 -->
-<g id="node3" class="node">
-<title>22</title>
-<polygon fill="#f2f2f2" stroke="black" points="0,-958.9 0,-1142.9 429.36,-1142.9 429.36,-958.9 0,-958.9"/>
-<text text-anchor="middle" x="214.68" y="-1126.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
-<text text-anchor="middle" x="214.68" y="-1109.5" font-family="Times,serif" font-size="14.00">IexecEscrowEvents</text>
-<text text-anchor="middle" x="214.68" y="-1092.7" font-family="Times,serif" font-size="14.00">contracts/interfaces/IexecEscrowEvents.sol</text>
-<polyline fill="none" stroke="black" points="0,-1084.5 429.36,-1084.5 "/>
-<text text-anchor="start" x="8" y="-1067.9" font-family="Times,serif" font-size="14.00">Public:</text>
-<text text-anchor="start" x="8" y="-1051.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Transfer(from: address, to: address, value: uint256)</text>
-<text text-anchor="start" x="8" y="-1034.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Approval(owner: address, spender: address, value: uint256)</text>
-<text text-anchor="start" x="8" y="-1017.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Reward(owner: address, amount: uint256, ref: bytes32)</text>
-<text text-anchor="start" x="8" y="-1000.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Seize(owner: address, amount: uint256, ref: bytes32)</text>
-<text text-anchor="start" x="8" y="-983.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Lock(owner: address, amount: uint256)</text>
-<text text-anchor="start" x="8" y="-967.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Unlock(owner: address, amount: uint256)</text>
-</g>
-<!-- 23&#45;&gt;22 -->
-<g id="edge9" class="edge">
-<title>23&#45;&gt;22</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M383.62,-808.93C354.37,-850.64 323.36,-894.87 296.01,-933.9"/>
-<polygon fill="none" stroke="black" points="287.23,-928.12 278.61,-958.71 304.43,-940.17 287.23,-928.12"/>
+<!-- 63 -->
+<g id="node22" class="node">
+<title>63</title>
+<polygon fill="#f2f2f2" stroke="black" points="2433.27,-498.7 2433.27,-699.5 2862.64,-699.5 2862.64,-498.7 2433.27,-498.7"/>
+<text text-anchor="middle" x="2647.95" y="-682.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
+<text text-anchor="middle" x="2647.95" y="-666.1" font-family="Times,serif" font-size="14.00">StakedRlcLib</text>
+<text text-anchor="middle" x="2647.95" y="-649.3" font-family="Times,serif" font-size="14.00">contracts/libs/StakedRlcLib.sol</text>
+<polyline fill="none" stroke="black" points="2433.27,-641.1 2862.64,-641.1 "/>
+<text text-anchor="start" x="2441.27" y="-624.5" font-family="Times,serif" font-size="14.00">Internal:</text>
+<text text-anchor="start" x="2441.27" y="-607.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;transfer(from: address, to: address, value: uint256)</text>
+<text text-anchor="start" x="2441.27" y="-590.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;mint(account: address, amount: uint256)</text>
+<text text-anchor="start" x="2441.27" y="-574.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;burn(account: address, amount: uint256)</text>
+<text text-anchor="start" x="2441.27" y="-557.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;approve(owner: address, spender: address, amount: uint256)</text>
+<text text-anchor="start" x="2441.27" y="-540.5" font-family="Times,serif" font-size="14.00">Public:</text>
+<text text-anchor="start" x="2441.27" y="-523.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Transfer(from: address, to: address, value: uint256)</text>
+<text text-anchor="start" x="2441.27" y="-506.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Approval(owner: address, spender: address, value: uint256)</text>
+</g>
+<!-- 8&#45;&gt;63 -->
+<g id="edge4" class="edge">
+<title>8&#45;&gt;63</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2122.64,-299.27C2217.56,-338.73 2325.13,-387.34 2418.95,-439.4 2447.7,-455.35 2477.33,-474.02 2505.34,-492.84"/>
+<polygon fill="black" stroke="black" points="2503.73,-495.98 2513.98,-498.68 2507.65,-490.18 2503.73,-495.98"/>
 </g>
 <!-- 24 -->
-<g id="node5" class="node">
+<g id="node4" class="node">
 <title>24</title>
-<polygon fill="#f2f2f2" stroke="black" points="2007.78,-1934.1 2007.78,-2034.1 2277.59,-2034.1 2277.59,-1934.1 2007.78,-1934.1"/>
-<text text-anchor="middle" x="2142.68" y="-2017.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
-<text text-anchor="middle" x="2142.68" y="-2000.7" font-family="Times,serif" font-size="14.00">IexecHubV3Interface</text>
-<text text-anchor="middle" x="2142.68" y="-1983.9" font-family="Times,serif" font-size="14.00">contracts/interfaces/IexecHubV3Interface.sol</text>
-<polyline fill="none" stroke="black" points="2007.78,-1975.7 2277.59,-1975.7 "/>
-<text text-anchor="start" x="2015.78" y="-1959.1" font-family="Times,serif" font-size="14.00">External:</text>
-<text text-anchor="start" x="2015.78" y="-1942.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;viewScore(worker: address): uint256</text>
+<polygon fill="#f2f2f2" stroke="black" points="2194.05,-1883.7 2194.05,-1983.7 2463.86,-1983.7 2463.86,-1883.7 2194.05,-1883.7"/>
+<text text-anchor="middle" x="2328.95" y="-1967.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
+<text text-anchor="middle" x="2328.95" y="-1950.3" font-family="Times,serif" font-size="14.00">IexecHubV3Interface</text>
+<text text-anchor="middle" x="2328.95" y="-1933.5" font-family="Times,serif" font-size="14.00">contracts/interfaces/IexecHubV3Interface.sol</text>
+<polyline fill="none" stroke="black" points="2194.05,-1925.3 2463.86,-1925.3 "/>
+<text text-anchor="start" x="2202.05" y="-1908.7" font-family="Times,serif" font-size="14.00">External:</text>
+<text text-anchor="start" x="2202.05" y="-1891.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;viewScore(worker: address): uint256</text>
 </g>
 <!-- 26&#45;&gt;50 -->
-<g id="edge10" class="edge">
+<g id="edge9" class="edge">
 <title>26&#45;&gt;50</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1193.68,-775.23C1193.68,-794.51 1193.68,-814.87 1193.68,-835.45"/>
-<polygon fill="black" stroke="black" points="1190.18,-835.56 1193.68,-845.56 1197.18,-835.56 1190.18,-835.56"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1081.1,-724.83C1061.57,-744.98 1040.89,-766.33 1020.03,-787.86"/>
+<polygon fill="black" stroke="black" points="1017.39,-785.55 1012.95,-795.16 1022.42,-790.42 1017.39,-785.55"/>
 </g>
 <!-- 53 -->
-<g id="node13" class="node">
+<g id="node12" class="node">
 <title>53</title>
-<polygon fill="#f2f2f2" stroke="black" points="389.07,-1875.3 389.07,-2092.9 612.29,-2092.9 612.29,-1875.3 389.07,-1875.3"/>
-<text text-anchor="middle" x="500.68" y="-2076.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="500.68" y="-2059.5" font-family="Times,serif" font-size="14.00">AppOrder</text>
-<text text-anchor="middle" x="500.68" y="-2042.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="389.07,-2034.5 612.29,-2034.5 "/>
-<text text-anchor="start" x="397.07" y="-2017.9" font-family="Times,serif" font-size="14.00">app: address</text>
-<text text-anchor="start" x="397.07" y="-2001.1" font-family="Times,serif" font-size="14.00">appprice: uint256</text>
-<text text-anchor="start" x="397.07" y="-1984.3" font-family="Times,serif" font-size="14.00">volume: uint256</text>
-<text text-anchor="start" x="397.07" y="-1967.5" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
-<text text-anchor="start" x="397.07" y="-1950.7" font-family="Times,serif" font-size="14.00">datasetrestrict: address</text>
-<text text-anchor="start" x="397.07" y="-1933.9" font-family="Times,serif" font-size="14.00">workerpoolrestrict: address</text>
-<text text-anchor="start" x="397.07" y="-1917.1" font-family="Times,serif" font-size="14.00">requesterrestrict: address</text>
-<text text-anchor="start" x="397.07" y="-1900.3" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
-<text text-anchor="start" x="397.07" y="-1883.5" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+<polygon fill="#f2f2f2" stroke="black" points="1430.35,-1824.9 1430.35,-2042.5 1653.56,-2042.5 1653.56,-1824.9 1430.35,-1824.9"/>
+<text text-anchor="middle" x="1541.95" y="-2025.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="1541.95" y="-2009.1" font-family="Times,serif" font-size="14.00">AppOrder</text>
+<text text-anchor="middle" x="1541.95" y="-1992.3" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="1430.35,-1984.1 1653.56,-1984.1 "/>
+<text text-anchor="start" x="1438.35" y="-1967.5" font-family="Times,serif" font-size="14.00">app: address</text>
+<text text-anchor="start" x="1438.35" y="-1950.7" font-family="Times,serif" font-size="14.00">appprice: uint256</text>
+<text text-anchor="start" x="1438.35" y="-1933.9" font-family="Times,serif" font-size="14.00">volume: uint256</text>
+<text text-anchor="start" x="1438.35" y="-1917.1" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
+<text text-anchor="start" x="1438.35" y="-1900.3" font-family="Times,serif" font-size="14.00">datasetrestrict: address</text>
+<text text-anchor="start" x="1438.35" y="-1883.5" font-family="Times,serif" font-size="14.00">workerpoolrestrict: address</text>
+<text text-anchor="start" x="1438.35" y="-1866.7" font-family="Times,serif" font-size="14.00">requesterrestrict: address</text>
+<text text-anchor="start" x="1438.35" y="-1849.9" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
+<text text-anchor="start" x="1438.35" y="-1833.1" font-family="Times,serif" font-size="14.00">sign: bytes</text>
 </g>
 <!-- 26&#45;&gt;53 -->
-<g id="edge12" class="edge">
+<g id="edge11" class="edge">
 <title>26&#45;&gt;53</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M724.07,-775.23C669.99,-797.13 626.66,-820.78 605.68,-845.2 476.45,-995.66 485.04,-1605.28 494.99,-1865"/>
-<polygon fill="black" stroke="black" points="491.5,-1865.36 495.39,-1875.22 498.5,-1865.09 491.5,-1865.36"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1370.73,-724.85C1392.49,-746.34 1412.78,-769.86 1428.95,-794.8 1636.29,-1114.46 1596.26,-1594.39 1563.23,-1814.61"/>
+<polygon fill="black" stroke="black" points="1559.75,-1814.16 1561.71,-1824.57 1566.68,-1815.21 1559.75,-1814.16"/>
 </g>
 <!-- 54 -->
-<g id="node14" class="node">
+<g id="node13" class="node">
 <title>54</title>
-<polygon fill="#f2f2f2" stroke="black" points="630.07,-1875.3 630.07,-2092.9 853.29,-2092.9 853.29,-1875.3 630.07,-1875.3"/>
-<text text-anchor="middle" x="741.68" y="-2076.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="741.68" y="-2059.5" font-family="Times,serif" font-size="14.00">DatasetOrder</text>
-<text text-anchor="middle" x="741.68" y="-2042.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="630.07,-2034.5 853.29,-2034.5 "/>
-<text text-anchor="start" x="638.07" y="-2017.9" font-family="Times,serif" font-size="14.00">dataset: address</text>
-<text text-anchor="start" x="638.07" y="-2001.1" font-family="Times,serif" font-size="14.00">datasetprice: uint256</text>
-<text text-anchor="start" x="638.07" y="-1984.3" font-family="Times,serif" font-size="14.00">volume: uint256</text>
-<text text-anchor="start" x="638.07" y="-1967.5" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
-<text text-anchor="start" x="638.07" y="-1950.7" font-family="Times,serif" font-size="14.00">apprestrict: address</text>
-<text text-anchor="start" x="638.07" y="-1933.9" font-family="Times,serif" font-size="14.00">workerpoolrestrict: address</text>
-<text text-anchor="start" x="638.07" y="-1917.1" font-family="Times,serif" font-size="14.00">requesterrestrict: address</text>
-<text text-anchor="start" x="638.07" y="-1900.3" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
-<text text-anchor="start" x="638.07" y="-1883.5" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+<polygon fill="#f2f2f2" stroke="black" points="554.35,-1824.9 554.35,-2042.5 777.56,-2042.5 777.56,-1824.9 554.35,-1824.9"/>
+<text text-anchor="middle" x="665.95" y="-2025.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="665.95" y="-2009.1" font-family="Times,serif" font-size="14.00">DatasetOrder</text>
+<text text-anchor="middle" x="665.95" y="-1992.3" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="554.35,-1984.1 777.56,-1984.1 "/>
+<text text-anchor="start" x="562.35" y="-1967.5" font-family="Times,serif" font-size="14.00">dataset: address</text>
+<text text-anchor="start" x="562.35" y="-1950.7" font-family="Times,serif" font-size="14.00">datasetprice: uint256</text>
+<text text-anchor="start" x="562.35" y="-1933.9" font-family="Times,serif" font-size="14.00">volume: uint256</text>
+<text text-anchor="start" x="562.35" y="-1917.1" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
+<text text-anchor="start" x="562.35" y="-1900.3" font-family="Times,serif" font-size="14.00">apprestrict: address</text>
+<text text-anchor="start" x="562.35" y="-1883.5" font-family="Times,serif" font-size="14.00">workerpoolrestrict: address</text>
+<text text-anchor="start" x="562.35" y="-1866.7" font-family="Times,serif" font-size="14.00">requesterrestrict: address</text>
+<text text-anchor="start" x="562.35" y="-1849.9" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
+<text text-anchor="start" x="562.35" y="-1833.1" font-family="Times,serif" font-size="14.00">sign: bytes</text>
 </g>
 <!-- 26&#45;&gt;54 -->
-<g id="edge11" class="edge">
+<g id="edge10" class="edge">
 <title>26&#45;&gt;54</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1013.74,-775.28C866.26,-889.95 669.35,-1074.85 589.68,-1292.6 515.25,-1496.03 512.7,-1577.52 589.68,-1780 597.29,-1800.01 608.31,-1799.28 621.68,-1816 634.53,-1832.06 647.67,-1849.35 660.31,-1866.5"/>
-<polygon fill="black" stroke="black" points="657.74,-1868.91 666.48,-1874.9 663.39,-1864.77 657.74,-1868.91"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M806.7,-724.77C689.98,-761.75 592.04,-793.02 588.95,-794.8 333.23,-942.33 217.23,-972.14 97.95,-1242.2 76.07,-1291.74 61.46,-1689.59 97.95,-1729.6 156.76,-1794.07 409.43,-1729.68 488.95,-1765.6 516.93,-1778.24 543.28,-1797.15 566.68,-1817.77"/>
+<polygon fill="black" stroke="black" points="564.39,-1820.43 574.17,-1824.52 569.08,-1815.23 564.39,-1820.43"/>
 </g>
 <!-- 55 -->
-<g id="node15" class="node">
+<g id="node14" class="node">
 <title>55</title>
-<polygon fill="#f2f2f2" stroke="black" points="1306.07,-1858.5 1306.07,-2109.7 1529.29,-2109.7 1529.29,-1858.5 1306.07,-1858.5"/>
-<text text-anchor="middle" x="1417.68" y="-2093.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="1417.68" y="-2076.3" font-family="Times,serif" font-size="14.00">WorkerpoolOrder</text>
-<text text-anchor="middle" x="1417.68" y="-2059.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="1306.07,-2051.3 1529.29,-2051.3 "/>
-<text text-anchor="start" x="1314.07" y="-2034.7" font-family="Times,serif" font-size="14.00">workerpool: address</text>
-<text text-anchor="start" x="1314.07" y="-2017.9" font-family="Times,serif" font-size="14.00">workerpoolprice: uint256</text>
-<text text-anchor="start" x="1314.07" y="-2001.1" font-family="Times,serif" font-size="14.00">volume: uint256</text>
-<text text-anchor="start" x="1314.07" y="-1984.3" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
-<text text-anchor="start" x="1314.07" y="-1967.5" font-family="Times,serif" font-size="14.00">category: uint256</text>
-<text text-anchor="start" x="1314.07" y="-1950.7" font-family="Times,serif" font-size="14.00">trust: uint256</text>
-<text text-anchor="start" x="1314.07" y="-1933.9" font-family="Times,serif" font-size="14.00">apprestrict: address</text>
-<text text-anchor="start" x="1314.07" y="-1917.1" font-family="Times,serif" font-size="14.00">datasetrestrict: address</text>
-<text text-anchor="start" x="1314.07" y="-1900.3" font-family="Times,serif" font-size="14.00">requesterrestrict: address</text>
-<text text-anchor="start" x="1314.07" y="-1883.5" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
-<text text-anchor="start" x="1314.07" y="-1866.7" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+<polygon fill="#f2f2f2" stroke="black" points="256.35,-1808.1 256.35,-2059.3 479.56,-2059.3 479.56,-1808.1 256.35,-1808.1"/>
+<text text-anchor="middle" x="367.95" y="-2042.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="367.95" y="-2025.9" font-family="Times,serif" font-size="14.00">WorkerpoolOrder</text>
+<text text-anchor="middle" x="367.95" y="-2009.1" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="256.35,-2000.9 479.56,-2000.9 "/>
+<text text-anchor="start" x="264.35" y="-1984.3" font-family="Times,serif" font-size="14.00">workerpool: address</text>
+<text text-anchor="start" x="264.35" y="-1967.5" font-family="Times,serif" font-size="14.00">workerpoolprice: uint256</text>
+<text text-anchor="start" x="264.35" y="-1950.7" font-family="Times,serif" font-size="14.00">volume: uint256</text>
+<text text-anchor="start" x="264.35" y="-1933.9" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
+<text text-anchor="start" x="264.35" y="-1917.1" font-family="Times,serif" font-size="14.00">category: uint256</text>
+<text text-anchor="start" x="264.35" y="-1900.3" font-family="Times,serif" font-size="14.00">trust: uint256</text>
+<text text-anchor="start" x="264.35" y="-1883.5" font-family="Times,serif" font-size="14.00">apprestrict: address</text>
+<text text-anchor="start" x="264.35" y="-1866.7" font-family="Times,serif" font-size="14.00">datasetrestrict: address</text>
+<text text-anchor="start" x="264.35" y="-1849.9" font-family="Times,serif" font-size="14.00">requesterrestrict: address</text>
+<text text-anchor="start" x="264.35" y="-1833.1" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
+<text text-anchor="start" x="264.35" y="-1816.3" font-family="Times,serif" font-size="14.00">sign: bytes</text>
 </g>
 <!-- 26&#45;&gt;55 -->
-<g id="edge13" class="edge">
+<g id="edge12" class="edge">
 <title>26&#45;&gt;55</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1445.59,-775.33C1632.94,-883.57 1874.58,-1059.51 1985.68,-1292.6 2008.98,-1341.49 2022.18,-1739.99 1985.68,-1780 1926.88,-1844.47 1674.2,-1780.08 1594.68,-1816 1574.31,-1825.2 1554.8,-1837.74 1536.66,-1851.83"/>
-<polygon fill="black" stroke="black" points="1534.05,-1849.43 1528.43,-1858.41 1538.42,-1854.9 1534.05,-1849.43"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M842.96,-724.77C794.67,-738.11 745.42,-750 697.95,-758.8 634.14,-770.63 161.62,-749.7 114.95,-794.8 -34.58,-939.31 -24.94,-1545.6 71.95,-1729.6 108.98,-1799.91 182.55,-1850.56 247.08,-1883.7"/>
+<polygon fill="black" stroke="black" points="245.61,-1886.88 256.12,-1888.26 248.77,-1880.63 245.61,-1886.88"/>
 </g>
 <!-- 56 -->
-<g id="node16" class="node">
+<g id="node15" class="node">
 <title>56</title>
-<polygon fill="#f2f2f2" stroke="black" points="1604.07,-1816.5 1604.07,-2151.7 1827.29,-2151.7 1827.29,-1816.5 1604.07,-1816.5"/>
-<text text-anchor="middle" x="1715.68" y="-2135.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="1715.68" y="-2118.3" font-family="Times,serif" font-size="14.00">RequestOrder</text>
-<text text-anchor="middle" x="1715.68" y="-2101.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="1604.07,-2093.3 1827.29,-2093.3 "/>
-<text text-anchor="start" x="1612.07" y="-2076.7" font-family="Times,serif" font-size="14.00">app: address</text>
-<text text-anchor="start" x="1612.07" y="-2059.9" font-family="Times,serif" font-size="14.00">appmaxprice: uint256</text>
-<text text-anchor="start" x="1612.07" y="-2043.1" font-family="Times,serif" font-size="14.00">dataset: address</text>
-<text text-anchor="start" x="1612.07" y="-2026.3" font-family="Times,serif" font-size="14.00">datasetmaxprice: uint256</text>
-<text text-anchor="start" x="1612.07" y="-2009.5" font-family="Times,serif" font-size="14.00">workerpool: address</text>
-<text text-anchor="start" x="1612.07" y="-1992.7" font-family="Times,serif" font-size="14.00">workerpoolmaxprice: uint256</text>
-<text text-anchor="start" x="1612.07" y="-1975.9" font-family="Times,serif" font-size="14.00">requester: address</text>
-<text text-anchor="start" x="1612.07" y="-1959.1" font-family="Times,serif" font-size="14.00">volume: uint256</text>
-<text text-anchor="start" x="1612.07" y="-1942.3" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
-<text text-anchor="start" x="1612.07" y="-1925.5" font-family="Times,serif" font-size="14.00">category: uint256</text>
-<text text-anchor="start" x="1612.07" y="-1908.7" font-family="Times,serif" font-size="14.00">trust: uint256</text>
-<text text-anchor="start" x="1612.07" y="-1891.9" font-family="Times,serif" font-size="14.00">beneficiary: address</text>
-<text text-anchor="start" x="1612.07" y="-1875.1" font-family="Times,serif" font-size="14.00">callback: address</text>
-<text text-anchor="start" x="1612.07" y="-1858.3" font-family="Times,serif" font-size="14.00">params: string</text>
-<text text-anchor="start" x="1612.07" y="-1841.5" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
-<text text-anchor="start" x="1612.07" y="-1824.7" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+<polygon fill="#f2f2f2" stroke="black" points="1132.35,-1766.1 1132.35,-2101.3 1355.56,-2101.3 1355.56,-1766.1 1132.35,-1766.1"/>
+<text text-anchor="middle" x="1243.95" y="-2084.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="1243.95" y="-2067.9" font-family="Times,serif" font-size="14.00">RequestOrder</text>
+<text text-anchor="middle" x="1243.95" y="-2051.1" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="1132.35,-2042.9 1355.56,-2042.9 "/>
+<text text-anchor="start" x="1140.35" y="-2026.3" font-family="Times,serif" font-size="14.00">app: address</text>
+<text text-anchor="start" x="1140.35" y="-2009.5" font-family="Times,serif" font-size="14.00">appmaxprice: uint256</text>
+<text text-anchor="start" x="1140.35" y="-1992.7" font-family="Times,serif" font-size="14.00">dataset: address</text>
+<text text-anchor="start" x="1140.35" y="-1975.9" font-family="Times,serif" font-size="14.00">datasetmaxprice: uint256</text>
+<text text-anchor="start" x="1140.35" y="-1959.1" font-family="Times,serif" font-size="14.00">workerpool: address</text>
+<text text-anchor="start" x="1140.35" y="-1942.3" font-family="Times,serif" font-size="14.00">workerpoolmaxprice: uint256</text>
+<text text-anchor="start" x="1140.35" y="-1925.5" font-family="Times,serif" font-size="14.00">requester: address</text>
+<text text-anchor="start" x="1140.35" y="-1908.7" font-family="Times,serif" font-size="14.00">volume: uint256</text>
+<text text-anchor="start" x="1140.35" y="-1891.9" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
+<text text-anchor="start" x="1140.35" y="-1875.1" font-family="Times,serif" font-size="14.00">category: uint256</text>
+<text text-anchor="start" x="1140.35" y="-1858.3" font-family="Times,serif" font-size="14.00">trust: uint256</text>
+<text text-anchor="start" x="1140.35" y="-1841.5" font-family="Times,serif" font-size="14.00">beneficiary: address</text>
+<text text-anchor="start" x="1140.35" y="-1824.7" font-family="Times,serif" font-size="14.00">callback: address</text>
+<text text-anchor="start" x="1140.35" y="-1807.9" font-family="Times,serif" font-size="14.00">params: string</text>
+<text text-anchor="start" x="1140.35" y="-1791.1" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
+<text text-anchor="start" x="1140.35" y="-1774.3" font-family="Times,serif" font-size="14.00">sign: bytes</text>
 </g>
 <!-- 26&#45;&gt;56 -->
-<g id="edge14" class="edge">
+<g id="edge13" class="edge">
 <title>26&#45;&gt;56</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1600.85,-775.11C1686.98,-803.97 1757.37,-830.51 1774.68,-845.2 1946.28,-990.76 1957.41,-1074.22 2011.68,-1292.6 2063.92,-1502.83 2112.62,-1588.33 2011.68,-1780 1974.65,-1850.31 1901.08,-1900.96 1836.56,-1934.1"/>
-<polygon fill="black" stroke="black" points="1834.87,-1931.03 1827.52,-1938.66 1838.02,-1937.28 1834.87,-1931.03"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1283.9,-724.97C1360.63,-849.92 1469.87,-1050.61 1513.95,-1242.2 1562.53,-1453.31 1636.4,-1550.9 1513.95,-1729.6 1488.9,-1766.16 1458.44,-1741.94 1420.95,-1765.6 1401.25,-1778.03 1381.83,-1792.86 1363.48,-1808.47"/>
+<polygon fill="black" stroke="black" points="1360.96,-1806.02 1355.68,-1815.21 1365.54,-1811.32 1360.96,-1806.02"/>
+</g>
+<!-- 35 -->
+<g id="node7" class="node">
+<title>35</title>
+<polygon fill="#f2f2f2" stroke="black" points="2688.32,-76.1 2688.32,-327.3 3093.59,-327.3 3093.59,-76.1 2688.32,-76.1"/>
+<text text-anchor="middle" x="2890.95" y="-310.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
+<text text-anchor="middle" x="2890.95" y="-293.9" font-family="Times,serif" font-size="14.00">EscrowLib</text>
+<text text-anchor="middle" x="2890.95" y="-277.1" font-family="Times,serif" font-size="14.00">contracts/libs/EscrowLib.sol</text>
+<polyline fill="none" stroke="black" points="2688.32,-268.9 3093.59,-268.9 "/>
+<text text-anchor="start" x="2696.32" y="-252.3" font-family="Times,serif" font-size="14.00">Internal:</text>
+<text text-anchor="start" x="2696.32" y="-235.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;lock(account: address, value: uint256)</text>
+<text text-anchor="start" x="2696.32" y="-218.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;unlock(account: address, value: uint256)</text>
+<text text-anchor="start" x="2696.32" y="-201.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;reward(account: address, value: uint256, ref: bytes32)</text>
+<text text-anchor="start" x="2696.32" y="-185.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;seize(account: address, value: uint256, ref: bytes32)</text>
+<text text-anchor="start" x="2696.32" y="-168.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;rewardAndLock(account: address, value: uint256, ref: bytes32)</text>
+<text text-anchor="start" x="2696.32" y="-151.5" font-family="Times,serif" font-size="14.00">Public:</text>
+<text text-anchor="start" x="2696.32" y="-134.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Reward(owner: address, amount: uint256, ref: bytes32)</text>
+<text text-anchor="start" x="2696.32" y="-117.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Seize(owner: address, amount: uint256, ref: bytes32)</text>
+<text text-anchor="start" x="2696.32" y="-101.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Lock(owner: address, amount: uint256)</text>
+<text text-anchor="start" x="2696.32" y="-84.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Unlock(owner: address, amount: uint256)</text>
 </g>
 <!-- 35&#45;&gt;61 -->
-<g id="edge15" class="edge">
+<g id="edge14" class="edge">
 <title>35&#45;&gt;61</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2343.6,-792.16C2357.06,-851.88 2372.23,-919.19 2383.69,-970.04"/>
-<polygon fill="black" stroke="black" points="2380.31,-971 2385.93,-979.99 2387.14,-969.46 2380.31,-971"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2898.24,-327.52C2904.43,-467.81 2907.42,-685.55 2871.95,-758.8 2839.07,-826.72 2777.1,-882.75 2719.42,-923.62"/>
+<polygon fill="black" stroke="black" points="2717.14,-920.94 2710.95,-929.53 2721.15,-926.68 2717.14,-920.94"/>
 </g>
 <!-- 35&#45;&gt;62 -->
-<g id="edge16" class="edge">
+<g id="edge15" class="edge">
 <title>35&#45;&gt;62</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2270.09,-792.16C2266.22,-809.89 2262.91,-827.87 2260.68,-845.2 2237.32,-1026.55 2218.25,-1078.75 2260.68,-1256.6 2262.81,-1265.51 2265.27,-1274.46 2268,-1283.4"/>
-<polygon fill="black" stroke="black" points="2264.72,-1284.62 2271.08,-1293.09 2271.39,-1282.5 2264.72,-1284.62"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2897.21,-327.35C2898.75,-363.49 2900.19,-403.01 2900.95,-439.4 2903.95,-581.32 2922.97,-618.56 2900.95,-758.8 2868.56,-965.16 2843.7,-1016.17 2756.95,-1206.2 2752.86,-1215.18 2748.53,-1224.22 2744.03,-1233.29"/>
+<polygon fill="black" stroke="black" points="2740.84,-1231.85 2739.48,-1242.36 2747.09,-1234.99 2740.84,-1231.85"/>
+</g>
+<!-- 35&#45;&gt;63 -->
+<g id="edge16" class="edge">
+<title>35&#45;&gt;63</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2814.23,-327.54C2782.22,-379.63 2745.38,-439.57 2714.53,-489.77"/>
+<polygon fill="black" stroke="black" points="2711.49,-488.03 2709.24,-498.38 2717.46,-491.69 2711.49,-488.03"/>
 </g>
 <!-- 36 -->
-<g id="node9" class="node">
+<g id="node8" class="node">
 <title>36</title>
-<polygon fill="#f2f2f2" stroke="black" points="2295.51,-1954.9 2295.51,-2013.3 2507.85,-2013.3 2507.85,-1954.9 2295.51,-1954.9"/>
-<text text-anchor="middle" x="2401.68" y="-1996.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
-<text text-anchor="middle" x="2401.68" y="-1979.9" font-family="Times,serif" font-size="14.00">IexecLibCore_v5</text>
-<text text-anchor="middle" x="2401.68" y="-1963.1" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polygon fill="#f2f2f2" stroke="black" points="2481.79,-1904.5 2481.79,-1962.9 2694.12,-1962.9 2694.12,-1904.5 2481.79,-1904.5"/>
+<text text-anchor="middle" x="2587.95" y="-1946.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
+<text text-anchor="middle" x="2587.95" y="-1929.5" font-family="Times,serif" font-size="14.00">IexecLibCore_v5</text>
+<text text-anchor="middle" x="2587.95" y="-1912.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
 </g>
 <!-- 52 -->
-<g id="node12" class="node">
+<g id="node11" class="node">
 <title>52</title>
-<polygon fill="#f2f2f2" stroke="black" points="1753.07,-1469.5 1753.07,-1603.1 1976.29,-1603.1 1976.29,-1469.5 1753.07,-1469.5"/>
-<text text-anchor="middle" x="1864.68" y="-1586.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="1864.68" y="-1569.7" font-family="Times,serif" font-size="14.00">EIP712Domain</text>
-<text text-anchor="middle" x="1864.68" y="-1552.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="1753.07,-1544.7 1976.29,-1544.7 "/>
-<text text-anchor="start" x="1761.07" y="-1528.1" font-family="Times,serif" font-size="14.00">name: string</text>
-<text text-anchor="start" x="1761.07" y="-1511.3" font-family="Times,serif" font-size="14.00">version: string</text>
-<text text-anchor="start" x="1761.07" y="-1494.5" font-family="Times,serif" font-size="14.00">chainId: uint256</text>
-<text text-anchor="start" x="1761.07" y="-1477.7" font-family="Times,serif" font-size="14.00">verifyingContract: address</text>
+<polygon fill="#f2f2f2" stroke="black" points="107.35,-1419.1 107.35,-1552.7 330.56,-1552.7 330.56,-1419.1 107.35,-1419.1"/>
+<text text-anchor="middle" x="218.95" y="-1536.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="218.95" y="-1519.3" font-family="Times,serif" font-size="14.00">EIP712Domain</text>
+<text text-anchor="middle" x="218.95" y="-1502.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="107.35,-1494.3 330.56,-1494.3 "/>
+<text text-anchor="start" x="115.35" y="-1477.7" font-family="Times,serif" font-size="14.00">name: string</text>
+<text text-anchor="start" x="115.35" y="-1460.9" font-family="Times,serif" font-size="14.00">version: string</text>
+<text text-anchor="start" x="115.35" y="-1444.1" font-family="Times,serif" font-size="14.00">chainId: uint256</text>
+<text text-anchor="start" x="115.35" y="-1427.3" font-family="Times,serif" font-size="14.00">verifyingContract: address</text>
 </g>
 <!-- 50&#45;&gt;52 -->
 <g id="edge27" class="edge">
 <title>50&#45;&gt;52</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1410.69,-1112.89C1516.66,-1150.78 1640.23,-1208.61 1729.68,-1292.6 1778.49,-1338.43 1811.76,-1407.42 1833.31,-1460.15"/>
-<polygon fill="black" stroke="black" points="1830.08,-1461.5 1837.06,-1469.46 1836.57,-1458.88 1830.08,-1461.5"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M598.18,-1075.05C508.71,-1114.19 409.08,-1169.48 335.95,-1242.2 288.81,-1289.08 255.54,-1357.29 236.55,-1409.47"/>
+<polygon fill="black" stroke="black" points="233.21,-1408.42 233.17,-1419.02 239.81,-1410.76 233.21,-1408.42"/>
 </g>
 <!-- 50&#45;&gt;53 -->
 <g id="edge28" class="edge">
 <title>50&#45;&gt;53</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M976.57,-1080.54C841.19,-1110.3 675.31,-1170.64 580.68,-1292.6 452.39,-1457.95 456.92,-1715.5 476.08,-1864.89"/>
-<polygon fill="black" stroke="black" points="472.64,-1865.56 477.43,-1875.02 479.58,-1864.64 472.64,-1865.56"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1031.81,-1014.73C1190.1,-1037.12 1395.37,-1094.97 1504.95,-1242.2 1628.9,-1408.73 1598.09,-1665.58 1567.88,-1814.58"/>
+<polygon fill="black" stroke="black" points="1564.39,-1814.18 1565.8,-1824.68 1571.24,-1815.59 1564.39,-1814.18"/>
 </g>
 <!-- 50&#45;&gt;54 -->
 <g id="edge29" class="edge">
 <title>50&#45;&gt;54</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M976.64,-1082.29C848.7,-1112.64 696.85,-1172.99 617.68,-1292.6 557.9,-1382.92 590.09,-1675.26 617.68,-1780 625.46,-1809.52 638.62,-1839.26 653.55,-1866.53"/>
-<polygon fill="black" stroke="black" points="650.52,-1868.28 658.46,-1875.29 656.63,-1864.86 650.52,-1868.28"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M696.19,-1205.72C691.89,-1217.88 688.09,-1230.09 684.95,-1242.2 634.31,-1437.95 638.21,-1675.23 649.36,-1814.52"/>
+<polygon fill="black" stroke="black" points="645.89,-1815.11 650.21,-1824.79 652.87,-1814.53 645.89,-1815.11"/>
 </g>
 <!-- 50&#45;&gt;55 -->
 <g id="edge30" class="edge">
 <title>50&#45;&gt;55</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1364.18,-1256.12C1370.43,-1268.06 1376.01,-1280.25 1380.68,-1292.6 1417.81,-1390.65 1417.29,-1676.64 1416.09,-1848.27"/>
-<polygon fill="black" stroke="black" points="1412.59,-1848.36 1416.02,-1858.38 1419.59,-1848.41 1412.59,-1848.36"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M598.01,-1070.97C517.54,-1108.63 434.41,-1163.91 386.95,-1242.2 332.35,-1332.28 339.48,-1623.64 352.25,-1797.79"/>
+<polygon fill="black" stroke="black" points="348.76,-1798.08 353,-1807.79 355.74,-1797.56 348.76,-1798.08"/>
 </g>
 <!-- 50&#45;&gt;56 -->
 <g id="edge31" class="edge">
 <title>50&#45;&gt;56</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1410.6,-1105.21C1509.4,-1140.99 1617.67,-1199.27 1678.68,-1292.6 1731.97,-1374.12 1728.93,-1629.95 1721.87,-1806.21"/>
-<polygon fill="black" stroke="black" points="1718.37,-1806.25 1721.46,-1816.39 1725.36,-1806.54 1718.37,-1806.25"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1031.86,-1086.32C1099.47,-1123.5 1166.77,-1174.46 1206.95,-1242.2 1256.56,-1325.84 1254.57,-1580.42 1248.72,-1755.92"/>
+<polygon fill="black" stroke="black" points="1245.22,-1755.93 1248.38,-1766.05 1252.22,-1756.17 1245.22,-1755.93"/>
 </g>
 <!-- 57 -->
-<g id="node17" class="node">
+<g id="node16" class="node">
 <title>57</title>
-<polygon fill="#f2f2f2" stroke="black" points="636.07,-1477.9 636.07,-1594.7 859.29,-1594.7 859.29,-1477.9 636.07,-1477.9"/>
-<text text-anchor="middle" x="747.68" y="-1578.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="747.68" y="-1561.3" font-family="Times,serif" font-size="14.00">AppOrderOperation</text>
-<text text-anchor="middle" x="747.68" y="-1544.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="636.07,-1536.3 859.29,-1536.3 "/>
-<text text-anchor="start" x="644.07" y="-1519.7" font-family="Times,serif" font-size="14.00">order: AppOrder</text>
-<text text-anchor="start" x="644.07" y="-1502.9" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
-<text text-anchor="start" x="644.07" y="-1486.1" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+<polygon fill="#f2f2f2" stroke="black" points="1281.35,-1427.5 1281.35,-1544.3 1504.56,-1544.3 1504.56,-1427.5 1281.35,-1427.5"/>
+<text text-anchor="middle" x="1392.95" y="-1527.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="1392.95" y="-1510.9" font-family="Times,serif" font-size="14.00">AppOrderOperation</text>
+<text text-anchor="middle" x="1392.95" y="-1494.1" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="1281.35,-1485.9 1504.56,-1485.9 "/>
+<text text-anchor="start" x="1289.35" y="-1469.3" font-family="Times,serif" font-size="14.00">order: AppOrder</text>
+<text text-anchor="start" x="1289.35" y="-1452.5" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
+<text text-anchor="start" x="1289.35" y="-1435.7" font-family="Times,serif" font-size="14.00">sign: bytes</text>
 </g>
 <!-- 50&#45;&gt;57 -->
 <g id="edge32" class="edge">
 <title>50&#45;&gt;57</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M976.82,-1182.38C934.28,-1214.98 892.44,-1252.28 858.68,-1292.6 814.74,-1345.08 781.97,-1416.38 763.52,-1468.12"/>
-<polygon fill="black" stroke="black" points="760.11,-1467.27 760.14,-1477.86 766.72,-1469.57 760.11,-1467.27"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1031.76,-1088.32C1109.87,-1126.69 1194.32,-1177.9 1257.95,-1242.2 1307.26,-1292.02 1341.6,-1365.1 1363.56,-1418.03"/>
+<polygon fill="black" stroke="black" points="1360.35,-1419.42 1367.39,-1427.34 1366.83,-1416.76 1360.35,-1419.42"/>
 </g>
 <!-- 58 -->
-<g id="node18" class="node">
+<g id="node17" class="node">
 <title>58</title>
-<polygon fill="#f2f2f2" stroke="black" points="877.07,-1477.9 877.07,-1594.7 1100.29,-1594.7 1100.29,-1477.9 877.07,-1477.9"/>
-<text text-anchor="middle" x="988.68" y="-1578.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="988.68" y="-1561.3" font-family="Times,serif" font-size="14.00">DatasetOrderOperation</text>
-<text text-anchor="middle" x="988.68" y="-1544.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="877.07,-1536.3 1100.29,-1536.3 "/>
-<text text-anchor="start" x="885.07" y="-1519.7" font-family="Times,serif" font-size="14.00">order: DatasetOrder</text>
-<text text-anchor="start" x="885.07" y="-1502.9" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
-<text text-anchor="start" x="885.07" y="-1486.1" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+<polygon fill="#f2f2f2" stroke="black" points="703.35,-1427.5 703.35,-1544.3 926.56,-1544.3 926.56,-1427.5 703.35,-1427.5"/>
+<text text-anchor="middle" x="814.95" y="-1527.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="814.95" y="-1510.9" font-family="Times,serif" font-size="14.00">DatasetOrderOperation</text>
+<text text-anchor="middle" x="814.95" y="-1494.1" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="703.35,-1485.9 926.56,-1485.9 "/>
+<text text-anchor="start" x="711.35" y="-1469.3" font-family="Times,serif" font-size="14.00">order: DatasetOrder</text>
+<text text-anchor="start" x="711.35" y="-1452.5" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
+<text text-anchor="start" x="711.35" y="-1435.7" font-family="Times,serif" font-size="14.00">sign: bytes</text>
 </g>
 <!-- 50&#45;&gt;58 -->
 <g id="edge33" class="edge">
 <title>50&#45;&gt;58</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1100.36,-1256.2C1067.85,-1332.17 1034.11,-1413.18 1012.28,-1468.25"/>
-<polygon fill="black" stroke="black" points="1008.89,-1467.29 1008.48,-1477.88 1015.4,-1469.86 1008.89,-1467.29"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M808.28,-1205.8C807.98,-1281.45 808.59,-1362.11 810.09,-1417.16"/>
+<polygon fill="black" stroke="black" points="806.61,-1417.58 810.4,-1427.48 813.6,-1417.38 806.61,-1417.58"/>
 </g>
 <!-- 59 -->
-<g id="node19" class="node">
+<g id="node18" class="node">
 <title>59</title>
-<polygon fill="#f2f2f2" stroke="black" points="1157.07,-1477.9 1157.07,-1594.7 1380.29,-1594.7 1380.29,-1477.9 1157.07,-1477.9"/>
-<text text-anchor="middle" x="1268.68" y="-1578.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="1268.68" y="-1561.3" font-family="Times,serif" font-size="14.00">WorkerpoolOrderOperation</text>
-<text text-anchor="middle" x="1268.68" y="-1544.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="1157.07,-1536.3 1380.29,-1536.3 "/>
-<text text-anchor="start" x="1165.07" y="-1519.7" font-family="Times,serif" font-size="14.00">order: WorkerpoolOrder</text>
-<text text-anchor="start" x="1165.07" y="-1502.9" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
-<text text-anchor="start" x="1165.07" y="-1486.1" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+<polygon fill="#f2f2f2" stroke="black" points="405.35,-1427.5 405.35,-1544.3 628.56,-1544.3 628.56,-1427.5 405.35,-1427.5"/>
+<text text-anchor="middle" x="516.95" y="-1527.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="516.95" y="-1510.9" font-family="Times,serif" font-size="14.00">WorkerpoolOrderOperation</text>
+<text text-anchor="middle" x="516.95" y="-1494.1" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="405.35,-1485.9 628.56,-1485.9 "/>
+<text text-anchor="start" x="413.35" y="-1469.3" font-family="Times,serif" font-size="14.00">order: WorkerpoolOrder</text>
+<text text-anchor="start" x="413.35" y="-1452.5" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
+<text text-anchor="start" x="413.35" y="-1435.7" font-family="Times,serif" font-size="14.00">sign: bytes</text>
 </g>
 <!-- 50&#45;&gt;59 -->
 <g id="edge34" class="edge">
 <title>50&#45;&gt;59</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1218.7,-1256.2C1230.17,-1332.01 1243.32,-1412.85 1253.37,-1467.9"/>
-<polygon fill="black" stroke="black" points="1249.96,-1468.68 1255.22,-1477.88 1256.84,-1467.41 1249.96,-1468.68"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M656.91,-1206.01C648.97,-1218.14 641.27,-1230.27 633.95,-1242.2 598.66,-1299.82 563.66,-1368.39 541.09,-1417.92"/>
+<polygon fill="black" stroke="black" points="537.8,-1416.7 536.88,-1427.25 544.18,-1419.57 537.8,-1416.7"/>
 </g>
 <!-- 60 -->
-<g id="node20" class="node">
+<g id="node19" class="node">
 <title>60</title>
-<polygon fill="#f2f2f2" stroke="black" points="1455.07,-1477.9 1455.07,-1594.7 1678.29,-1594.7 1678.29,-1477.9 1455.07,-1477.9"/>
-<text text-anchor="middle" x="1566.68" y="-1578.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="1566.68" y="-1561.3" font-family="Times,serif" font-size="14.00">RequestOrderOperation</text>
-<text text-anchor="middle" x="1566.68" y="-1544.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="1455.07,-1536.3 1678.29,-1536.3 "/>
-<text text-anchor="start" x="1463.07" y="-1519.7" font-family="Times,serif" font-size="14.00">order: RequestOrder</text>
-<text text-anchor="start" x="1463.07" y="-1502.9" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
-<text text-anchor="start" x="1463.07" y="-1486.1" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+<polygon fill="#f2f2f2" stroke="black" points="983.35,-1427.5 983.35,-1544.3 1206.56,-1544.3 1206.56,-1427.5 983.35,-1427.5"/>
+<text text-anchor="middle" x="1094.95" y="-1527.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="1094.95" y="-1510.9" font-family="Times,serif" font-size="14.00">RequestOrderOperation</text>
+<text text-anchor="middle" x="1094.95" y="-1494.1" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="983.35,-1485.9 1206.56,-1485.9 "/>
+<text text-anchor="start" x="991.35" y="-1469.3" font-family="Times,serif" font-size="14.00">order: RequestOrder</text>
+<text text-anchor="start" x="991.35" y="-1452.5" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
+<text text-anchor="start" x="991.35" y="-1435.7" font-family="Times,serif" font-size="14.00">sign: bytes</text>
 </g>
 <!-- 50&#45;&gt;60 -->
 <g id="edge35" class="edge">
 <title>50&#45;&gt;60</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1402.99,-1256.45C1413.03,-1268.37 1422.67,-1280.46 1431.68,-1292.6 1472.57,-1347.69 1507.45,-1417.91 1531.69,-1468.64"/>
-<polygon fill="black" stroke="black" points="1528.63,-1470.35 1536.09,-1477.87 1534.95,-1467.34 1528.63,-1470.35"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M938.5,-1205.9C945.86,-1218.12 953.07,-1230.28 959.95,-1242.2 993.72,-1300.63 1028.84,-1369.01 1054.94,-1418.26"/>
+<polygon fill="black" stroke="black" points="1051.92,-1420.04 1059.7,-1427.23 1058.1,-1416.76 1051.92,-1420.04"/>
 </g>
 <!-- 51 -->
-<g id="node11" class="node">
+<g id="node10" class="node">
 <title>51</title>
-<polygon fill="#f2f2f2" stroke="black" points="1017.07,-1934.1 1017.07,-2034.1 1240.29,-2034.1 1240.29,-1934.1 1017.07,-1934.1"/>
-<text text-anchor="middle" x="1128.68" y="-2017.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Enum&gt;&gt;</text>
-<text text-anchor="middle" x="1128.68" y="-2000.7" font-family="Times,serif" font-size="14.00">OrderOperationEnum</text>
-<text text-anchor="middle" x="1128.68" y="-1983.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="1017.07,-1975.7 1240.29,-1975.7 "/>
-<text text-anchor="start" x="1025.07" y="-1959.1" font-family="Times,serif" font-size="14.00">SIGN: 0</text>
-<text text-anchor="start" x="1025.07" y="-1942.3" font-family="Times,serif" font-size="14.00">CLOSE: 1</text>
+<polygon fill="#f2f2f2" stroke="black" points="843.35,-1883.7 843.35,-1983.7 1066.56,-1983.7 1066.56,-1883.7 843.35,-1883.7"/>
+<text text-anchor="middle" x="954.95" y="-1967.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Enum&gt;&gt;</text>
+<text text-anchor="middle" x="954.95" y="-1950.3" font-family="Times,serif" font-size="14.00">OrderOperationEnum</text>
+<text text-anchor="middle" x="954.95" y="-1933.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="843.35,-1925.3 1066.56,-1925.3 "/>
+<text text-anchor="start" x="851.35" y="-1908.7" font-family="Times,serif" font-size="14.00">SIGN: 0</text>
+<text text-anchor="start" x="851.35" y="-1891.9" font-family="Times,serif" font-size="14.00">CLOSE: 1</text>
 </g>
 <!-- 51&#45;&gt;50 -->
 <g id="edge17" class="edge">
 <title>51&#45;&gt;50</title>
-<path fill="none" stroke="black" d="M1127.32,-1933.94C1124.78,-1820.52 1121.69,-1531.94 1147.68,-1292.6 1148.55,-1284.64 1149.53,-1276.56 1150.62,-1268.4"/>
-<polygon fill="black" stroke="black" points="1150.63,-1268.3 1147.49,-1261.81 1152.27,-1256.41 1155.41,-1262.9 1150.63,-1268.3"/>
+<path fill="none" stroke="black" d="M956.37,-1883.22C959.87,-1746.14 966.52,-1363.58 935.95,-1242.2 933.9,-1234.03 931.53,-1225.82 928.91,-1217.61"/>
+<polygon fill="black" stroke="black" points="928.84,-1217.4 923.14,-1212.98 925.04,-1206.02 930.73,-1210.44 928.84,-1217.4"/>
 </g>
 <!-- 52&#45;&gt;50 -->
 <g id="edge18" class="edge">
 <title>52&#45;&gt;50</title>
-<path fill="none" stroke="black" d="M1851.48,-1469.46C1833.7,-1415.79 1799.42,-1341.18 1747.68,-1292.6 1656.92,-1207.38 1531.02,-1149.09 1422.16,-1111.24"/>
-<polygon fill="black" stroke="black" points="1422.02,-1111.19 1415.05,-1113.03 1410.67,-1107.3 1417.64,-1105.46 1422.02,-1111.19"/>
+<path fill="none" stroke="black" d="M247.64,-1419.02C269.46,-1365.87 303.88,-1292 353.95,-1242.2 419.45,-1177.06 506.2,-1125.91 586.78,-1087.83"/>
+<polygon fill="black" stroke="black" points="587.23,-1087.62 590.98,-1081.46 598.11,-1082.54 594.36,-1088.71 587.23,-1087.62"/>
 </g>
 <!-- 53&#45;&gt;50 -->
 <g id="edge19" class="edge">
 <title>53&#45;&gt;50</title>
-<path fill="none" stroke="black" d="M489.46,-1875.02C475.2,-1727.38 467.44,-1461.75 598.68,-1292.6 687.01,-1178.77 837.41,-1118.61 964.91,-1086.9"/>
-<polygon fill="black" stroke="black" points="965.12,-1086.85 970.01,-1081.55 976.78,-1084.01 971.9,-1089.32 965.12,-1086.85"/>
+<path fill="none" stroke="black" d="M1577.85,-1824.68C1614.59,-1677.43 1649.75,-1412.55 1522.95,-1242.2 1412.77,-1094.17 1205.87,-1036.49 1044.05,-1014.37"/>
+<polygon fill="black" stroke="black" points="1043.88,-1014.35 1037.41,-1017.53 1031.99,-1012.78 1038.46,-1009.6 1043.88,-1014.35"/>
 </g>
 <!-- 54&#45;&gt;50 -->
 <g id="edge20" class="edge">
 <title>54&#45;&gt;50</title>
-<path fill="none" stroke="black" d="M675.83,-1875.29C659.53,-1845.7 644.3,-1812.72 635.68,-1780 608.09,-1675.26 575.9,-1382.92 635.68,-1292.6 709.22,-1181.48 845.5,-1121.51 964.98,-1089.22"/>
-<polygon fill="black" stroke="black" points="965.25,-1089.15 970.03,-1083.75 976.86,-1086.09 972.08,-1091.49 965.25,-1089.15"/>
+<path fill="none" stroke="black" d="M662.68,-1824.79C656.44,-1687.13 651.04,-1442.85 702.95,-1242.2 705.11,-1233.87 707.58,-1225.5 710.3,-1217.13"/>
+<polygon fill="black" stroke="black" points="710.32,-1217.09 708.46,-1210.12 714.17,-1205.72 716.03,-1212.69 710.32,-1217.09"/>
 </g>
 <!-- 55&#45;&gt;50 -->
 <g id="edge21" class="edge">
 <title>55&#45;&gt;50</title>
-<path fill="none" stroke="black" d="M1427.94,-1858.38C1435.26,-1688.11 1436.55,-1392.6 1398.68,-1292.6 1395.43,-1284.01 1391.74,-1275.51 1387.69,-1267.1"/>
-<polygon fill="black" stroke="black" points="1387.56,-1266.83 1381.29,-1263.27 1382.16,-1256.12 1388.43,-1259.68 1387.56,-1266.83"/>
+<path fill="none" stroke="black" d="M364.85,-1807.79C357.78,-1635.03 349.29,-1334.03 404.95,-1242.2 446.94,-1172.94 516.85,-1121.69 587.17,-1084.71"/>
+<polygon fill="black" stroke="black" points="587.33,-1084.62 590.83,-1078.32 597.99,-1079.12 594.49,-1085.43 587.33,-1084.62"/>
 </g>
 <!-- 56&#45;&gt;50 -->
 <g id="edge22" class="edge">
 <title>56&#45;&gt;50</title>
-<path fill="none" stroke="black" d="M1734.59,-1816.39C1746.79,-1639.94 1751,-1375.7 1696.68,-1292.6 1634.67,-1197.74 1523.83,-1139.08 1421.94,-1103.46"/>
-<polygon fill="black" stroke="black" points="1421.87,-1103.44 1414.9,-1105.28 1410.52,-1099.55 1417.49,-1097.71 1421.87,-1103.44"/>
+<path fill="none" stroke="black" d="M1261.54,-1766.05C1272.48,-1590.37 1275.53,-1327.46 1224.95,-1242.2 1183.58,-1172.45 1113.46,-1120.49 1042.78,-1083.05"/>
+<polygon fill="black" stroke="black" points="1042.55,-1082.93 1035.38,-1083.72 1031.9,-1077.4 1039.06,-1076.62 1042.55,-1082.93"/>
 </g>
 <!-- 57&#45;&gt;50 -->
 <g id="edge23" class="edge">
 <title>57&#45;&gt;50</title>
-<path fill="none" stroke="black" d="M774.14,-1477.86C795.79,-1425.65 829.91,-1348.46 876.68,-1292.6 903.09,-1261.05 934.44,-1231.36 967,-1204.32"/>
-<polygon fill="black" stroke="black" points="967.39,-1204 969.5,-1197.1 976.67,-1196.39 974.57,-1203.29 967.39,-1204"/>
+<path fill="none" stroke="black" d="M1381.28,-1427.34C1363.67,-1373.96 1328.22,-1295.01 1275.95,-1242.2 1210.72,-1176.28 1123.6,-1124.11 1042.65,-1085.44"/>
+<polygon fill="black" stroke="black" points="1042.64,-1085.44 1035.5,-1086.49 1031.78,-1080.31 1038.92,-1079.26 1042.64,-1085.44"/>
 </g>
 <!-- 57&#45;&gt;51 -->
 <g id="edge37" class="edge">
 <title>57&#45;&gt;51</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M767.57,-1594.71C787.46,-1646.73 821.7,-1723.64 867.68,-1780 915.83,-1839.01 984.16,-1891.4 1038.83,-1928.19"/>
-<polygon fill="black" stroke="black" points="1037.22,-1931.32 1047.48,-1933.95 1041.1,-1925.49 1037.22,-1931.32"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1363.73,-1544.3C1333.41,-1598.72 1281.3,-1679.41 1215.95,-1729.6 1180.8,-1756.6 1160.12,-1741.46 1122.95,-1765.6 1076.61,-1795.7 1032.64,-1840.23 1001.32,-1875.75"/>
+<polygon fill="black" stroke="black" points="998.37,-1873.81 994.43,-1883.64 1003.64,-1878.41 998.37,-1873.81"/>
 </g>
 <!-- 57&#45;&gt;53 -->
 <g id="edge36" class="edge">
 <title>57&#45;&gt;53</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M715.64,-1595.12C677.78,-1663.45 613.84,-1778.87 565.51,-1866.1"/>
-<polygon fill="black" stroke="black" points="562.37,-1864.54 560.58,-1874.98 568.49,-1867.93 562.37,-1864.54"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1412.28,-1544.72C1435.05,-1612.85 1473.46,-1727.77 1502.58,-1814.91"/>
+<polygon fill="black" stroke="black" points="1499.33,-1816.21 1505.82,-1824.58 1505.97,-1813.99 1499.33,-1816.21"/>
 </g>
 <!-- 58&#45;&gt;50 -->
 <g id="edge24" class="edge">
 <title>58&#45;&gt;50</title>
-<path fill="none" stroke="black" d="M1017.59,-1477.88C1041.45,-1425.5 1076.42,-1344.74 1108.94,-1267.56"/>
-<polygon fill="black" stroke="black" points="1109.06,-1267.27 1107.7,-1260.18 1113.72,-1256.2 1115.08,-1263.29 1109.06,-1267.27"/>
+<path fill="none" stroke="black" d="M819.51,-1427.48C821.15,-1375.32 821.87,-1295 821.67,-1218.11"/>
+<polygon fill="black" stroke="black" points="821.67,-1217.8 817.65,-1211.82 821.63,-1205.8 825.65,-1211.79 821.67,-1217.8"/>
 </g>
 <!-- 58&#45;&gt;51 -->
 <g id="edge39" class="edge">
 <title>58&#45;&gt;51</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1006.84,-1595.12C1033.59,-1680.31 1083.32,-1838.66 1110.24,-1924.36"/>
-<polygon fill="black" stroke="black" points="1106.91,-1925.45 1113.24,-1933.94 1113.59,-1923.35 1106.91,-1925.45"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M833.11,-1544.72C859.86,-1629.91 909.59,-1788.26 936.51,-1873.96"/>
+<polygon fill="black" stroke="black" points="933.18,-1875.05 939.52,-1883.54 939.86,-1872.95 933.18,-1875.05"/>
 </g>
 <!-- 58&#45;&gt;54 -->
 <g id="edge38" class="edge">
 <title>58&#45;&gt;54</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M962.13,-1595.01C938.8,-1644.72 903.27,-1718.02 868.68,-1780 852.79,-1808.47 834.73,-1838.54 817.31,-1866.58"/>
-<polygon fill="black" stroke="black" points="814.25,-1864.87 811.93,-1875.21 820.19,-1868.57 814.25,-1864.87"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M795.63,-1544.72C772.86,-1612.85 734.45,-1727.77 705.32,-1814.91"/>
+<polygon fill="black" stroke="black" points="701.94,-1813.99 702.09,-1824.58 708.58,-1816.21 701.94,-1813.99"/>
 </g>
 <!-- 59&#45;&gt;50 -->
 <g id="edge25" class="edge">
 <title>59&#45;&gt;50</title>
-<path fill="none" stroke="black" d="M1264.33,-1477.88C1257.88,-1425.72 1246.14,-1345.4 1234.01,-1268.51"/>
-<polygon fill="black" stroke="black" points="1233.93,-1268.06 1229.04,-1262.76 1232.06,-1256.2 1236.95,-1261.5 1233.93,-1268.06"/>
+<path fill="none" stroke="black" d="M551.15,-1427.25C577.15,-1377.27 614.38,-1303.53 651.95,-1242.2 657.21,-1233.62 662.67,-1224.95 668.26,-1216.24"/>
+<polygon fill="black" stroke="black" points="668.36,-1216.08 668.27,-1208.87 674.89,-1206.01 674.98,-1213.22 668.36,-1216.08"/>
 </g>
 <!-- 59&#45;&gt;51 -->
 <g id="edge41" class="edge">
 <title>59&#45;&gt;51</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1250.52,-1595.12C1223.77,-1680.31 1174.04,-1838.66 1147.13,-1924.36"/>
-<polygon fill="black" stroke="black" points="1143.78,-1923.35 1144.12,-1933.94 1150.46,-1925.45 1143.78,-1923.35"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M546.18,-1544.3C576.5,-1598.72 628.61,-1679.41 693.95,-1729.6 729.1,-1756.6 749.78,-1741.46 786.95,-1765.6 833.3,-1795.7 877.27,-1840.23 908.59,-1875.75"/>
+<polygon fill="black" stroke="black" points="906.27,-1878.41 915.48,-1883.64 911.54,-1873.81 906.27,-1878.41"/>
 </g>
 <!-- 59&#45;&gt;55 -->
 <g id="edge40" class="edge">
 <title>59&#45;&gt;55</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1288.01,-1595.12C1309.35,-1658.98 1344.44,-1763.96 1372.74,-1848.63"/>
-<polygon fill="black" stroke="black" points="1369.49,-1849.95 1375.98,-1858.32 1376.13,-1847.73 1369.49,-1849.95"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M497.63,-1544.72C476.28,-1608.58 441.2,-1713.56 412.9,-1798.23"/>
+<polygon fill="black" stroke="black" points="409.51,-1797.33 409.66,-1807.92 416.15,-1799.55 409.51,-1797.33"/>
 </g>
 <!-- 60&#45;&gt;50 -->
 <g id="edge26" class="edge">
 <title>60&#45;&gt;50</title>
-<path fill="none" stroke="black" d="M1550.21,-1477.87C1529.77,-1426.72 1493.12,-1351.11 1449.68,-1292.6 1439.99,-1279.54 1429.57,-1266.55 1418.69,-1253.75"/>
-<polygon fill="black" stroke="black" points="1418.52,-1253.55 1411.57,-1251.62 1410.68,-1244.46 1417.63,-1246.39 1418.52,-1253.55"/>
+<path fill="none" stroke="black" d="M1074.01,-1427.23C1051.22,-1377.55 1013.82,-1304.27 977.95,-1242.2 973,-1233.63 967.89,-1224.94 962.66,-1216.19"/>
+<polygon fill="black" stroke="black" points="962.66,-1216.19 956.14,-1213.11 956.48,-1205.9 963,-1208.98 962.66,-1216.19"/>
 </g>
 <!-- 60&#45;&gt;51 -->
 <g id="edge43" class="edge">
 <title>60&#45;&gt;51</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1537.45,-1594.7C1507.13,-1649.12 1455.03,-1729.81 1389.68,-1780 1354.53,-1807 1333.85,-1791.86 1296.68,-1816 1250.33,-1846.1 1206.37,-1890.63 1175.04,-1926.15"/>
-<polygon fill="black" stroke="black" points="1172.09,-1924.21 1168.16,-1934.04 1177.37,-1928.81 1172.09,-1924.21"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1076.8,-1544.72C1050.04,-1629.91 1000.31,-1788.26 973.4,-1873.96"/>
+<polygon fill="black" stroke="black" points="970.05,-1872.95 970.39,-1883.54 976.73,-1875.05 970.05,-1872.95"/>
 </g>
 <!-- 60&#45;&gt;56 -->
 <g id="edge42" class="edge">
 <title>60&#45;&gt;56</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1586.01,-1595.12C1603.94,-1648.78 1631.58,-1731.48 1656.74,-1806.75"/>
-<polygon fill="black" stroke="black" points="1653.47,-1807.99 1659.95,-1816.37 1660.1,-1805.78 1653.47,-1807.99"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1114.28,-1544.72C1132.21,-1598.38 1159.85,-1681.08 1185.01,-1756.35"/>
+<polygon fill="black" stroke="black" points="1181.74,-1757.59 1188.23,-1765.97 1188.38,-1755.38 1181.74,-1757.59"/>
 </g>
 <!-- 61&#45;&gt;62 -->
 <g id="edge45" class="edge">
 <title>61&#45;&gt;62</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2396.76,-1121.93C2395.61,-1165.16 2395,-1223.52 2394.94,-1282.75"/>
-<polygon fill="black" stroke="black" points="2391.44,-1283.04 2394.93,-1293.04 2398.44,-1283.04 2391.44,-1283.04"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2583.03,-1071.53C2581.88,-1114.76 2581.28,-1173.12 2581.21,-1232.35"/>
+<polygon fill="black" stroke="black" points="2577.71,-1232.64 2581.2,-1242.64 2584.71,-1232.64 2577.71,-1232.64"/>
 </g>
 <!-- 62&#45;&gt;24 -->
 <g id="edge48" class="edge">
 <title>62&#45;&gt;24</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2260.81,-1779.77C2229.29,-1834.03 2198.67,-1886.73 2176.51,-1924.88"/>
-<polygon fill="black" stroke="black" points="2173.34,-1923.36 2171.34,-1933.77 2179.39,-1926.88 2173.34,-1923.36"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2447.09,-1729.37C2415.56,-1783.63 2384.94,-1836.33 2362.78,-1874.48"/>
+<polygon fill="black" stroke="black" points="2359.61,-1872.96 2357.62,-1883.37 2365.67,-1876.48 2359.61,-1872.96"/>
 </g>
 <!-- 62&#45;&gt;36 -->
 <g id="edge47" class="edge">
 <title>62&#45;&gt;36</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2401.68,-1779.77C2401.68,-1844.17 2401.68,-1906.37 2401.68,-1944.66"/>
-<polygon fill="black" stroke="black" points="2398.18,-1944.8 2401.68,-1954.8 2405.18,-1944.8 2398.18,-1944.8"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2587.95,-1729.37C2587.95,-1793.77 2587.95,-1855.97 2587.95,-1894.26"/>
+<polygon fill="black" stroke="black" points="2584.45,-1894.4 2587.95,-1904.4 2591.45,-1894.4 2584.45,-1894.4"/>
 </g>
 <!-- 62&#45;&gt;61 -->
 <g id="edge44" class="edge">
 <title>62&#45;&gt;61</title>
-<path fill="none" stroke="black" d="M2408.43,-1293.04C2408.43,-1235.71 2407.92,-1178.43 2406.9,-1134.09"/>
-<polygon fill="black" stroke="black" points="2406.9,-1133.93 2402.75,-1128.03 2406.6,-1121.93 2410.75,-1127.83 2406.9,-1133.93"/>
+<path fill="none" stroke="black" d="M2594.7,-1242.64C2594.7,-1185.31 2594.19,-1128.03 2593.18,-1083.69"/>
+<polygon fill="black" stroke="black" points="2593.17,-1083.53 2589.02,-1077.63 2592.88,-1071.53 2597.02,-1077.43 2593.17,-1083.53"/>
 </g>
-<!-- 63 -->
+<!-- 64 -->
 <g id="node23" class="node">
-<title>63</title>
-<polygon fill="#f2f2f2" stroke="black" points="2525.96,-1934.1 2525.96,-2034.1 2755.41,-2034.1 2755.41,-1934.1 2525.96,-1934.1"/>
-<text text-anchor="middle" x="2640.68" y="-2017.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
-<text text-anchor="middle" x="2640.68" y="-2000.7" font-family="Times,serif" font-size="14.00">IRegistry</text>
-<text text-anchor="middle" x="2640.68" y="-1983.9" font-family="Times,serif" font-size="14.00">contracts/registries/IRegistry.sol</text>
-<polyline fill="none" stroke="black" points="2525.96,-1975.7 2755.41,-1975.7 "/>
-<text text-anchor="start" x="2533.96" y="-1959.1" font-family="Times,serif" font-size="14.00">External:</text>
-<text text-anchor="start" x="2533.96" y="-1942.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;isRegistered(_entry: address): bool</text>
-</g>
-<!-- 62&#45;&gt;63 -->
+<title>64</title>
+<polygon fill="#f2f2f2" stroke="black" points="2712.23,-1883.7 2712.23,-1983.7 2941.68,-1983.7 2941.68,-1883.7 2712.23,-1883.7"/>
+<text text-anchor="middle" x="2826.95" y="-1967.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
+<text text-anchor="middle" x="2826.95" y="-1950.3" font-family="Times,serif" font-size="14.00">IRegistry</text>
+<text text-anchor="middle" x="2826.95" y="-1933.5" font-family="Times,serif" font-size="14.00">contracts/registries/IRegistry.sol</text>
+<polyline fill="none" stroke="black" points="2712.23,-1925.3 2941.68,-1925.3 "/>
+<text text-anchor="start" x="2720.23" y="-1908.7" font-family="Times,serif" font-size="14.00">External:</text>
+<text text-anchor="start" x="2720.23" y="-1891.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;isRegistered(_entry: address): bool</text>
+</g>
+<!-- 62&#45;&gt;64 -->
 <g id="edge46" class="edge">
-<title>62&#45;&gt;63</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2531.67,-1779.77C2560.76,-1834.03 2589.02,-1886.73 2609.47,-1924.88"/>
-<polygon fill="black" stroke="black" points="2606.42,-1926.61 2614.23,-1933.77 2612.59,-1923.3 2606.42,-1926.61"/>
+<title>62&#45;&gt;64</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2717.94,-1729.37C2747.03,-1783.63 2775.29,-1836.33 2795.74,-1874.48"/>
+<polygon fill="black" stroke="black" points="2792.7,-1876.21 2800.51,-1883.37 2798.87,-1872.9 2792.7,-1876.21"/>
+</g>
+<!-- 63&#45;&gt;61 -->
+<g id="edge49" class="edge">
+<title>63&#45;&gt;61</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2633.01,-699.6C2622.81,-767.47 2609.48,-856.2 2599.97,-919.49"/>
+<polygon fill="black" stroke="black" points="2596.51,-919.02 2598.48,-929.43 2603.43,-920.06 2596.51,-919.02"/>
+</g>
+<!-- 63&#45;&gt;62 -->
+<g id="edge50" class="edge">
+<title>63&#45;&gt;62</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2698.14,-699.52C2710.77,-729.39 2722.55,-762.76 2728.95,-794.8 2764.76,-974.1 2771.38,-1028.35 2728.95,-1206.2 2726.83,-1215.11 2724.37,-1224.06 2721.63,-1233"/>
+<polygon fill="black" stroke="black" points="2718.24,-1232.1 2718.55,-1242.69 2724.91,-1234.22 2718.24,-1232.1"/>
 </g>
 </g>
 </svg>
diff --git a/docs/uml/class-uml-IexecPocoBoostFacet.svg b/docs/uml/class-uml-IexecPocoBoostFacet.svg
index 4eefbacf7..e5cf871b5 100644
--- a/docs/uml/class-uml-IexecPocoBoostFacet.svg
+++ b/docs/uml/class-uml-IexecPocoBoostFacet.svg
@@ -4,831 +4,864 @@
 <!-- Generated by graphviz version 5.0.0 (20220707.1540)
  -->
 <!-- Title: UmlClassDiagram Pages: 1 -->
-<svg width="5311pt" height="1883pt"
- viewBox="0.00 0.00 5311.17 1882.60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 1878.6)">
+<svg width="4859pt" height="2003pt"
+ viewBox="0.00 0.00 4858.68 2002.80" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 1998.8)">
 <title>UmlClassDiagram</title>
-<polygon fill="white" stroke="transparent" points="-4,4 -4,-1878.6 5307.17,-1878.6 5307.17,4 -4,4"/>
+<polygon fill="white" stroke="transparent" points="-4,4 -4,-1998.8 4854.68,-1998.8 4854.68,4 -4,4"/>
 <!-- 3 -->
 <g id="node1" class="node">
 <title>3</title>
-<polygon fill="#f2f2f2" stroke="black" points="0,-221.5 0,-531.1 309.19,-531.1 309.19,-221.5 0,-221.5"/>
-<text text-anchor="middle" x="154.6" y="-514.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Abstract&gt;&gt;</text>
-<text text-anchor="middle" x="154.6" y="-497.7" font-family="Times,serif" font-size="14.00">FacetBase</text>
-<text text-anchor="middle" x="154.6" y="-480.9" font-family="Times,serif" font-size="14.00">contracts/abstract/FacetBase.sol</text>
-<polyline fill="none" stroke="black" points="0,-472.7 309.19,-472.7 "/>
-<text text-anchor="start" x="8" y="-456.1" font-family="Times,serif" font-size="14.00">Internal:</text>
-<text text-anchor="start" x="8" y="-439.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;CONTRIBUTION_DEADLINE_RATIO: uint256</text>
-<text text-anchor="start" x="8" y="-422.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;REVEAL_DEADLINE_RATIO: uint256</text>
-<text text-anchor="start" x="8" y="-405.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;FINAL_DEADLINE_RATIO: uint256</text>
-<text text-anchor="start" x="8" y="-388.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;WORKERPOOL_STAKE_RATIO: uint256</text>
-<text text-anchor="start" x="8" y="-372.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;KITTY_RATIO: uint256</text>
-<text text-anchor="start" x="8" y="-355.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;KITTY_MIN: uint256</text>
-<text text-anchor="start" x="8" y="-338.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;KITTY_ADDRESS: address</text>
-<text text-anchor="start" x="8" y="-321.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;GROUPMEMBER_PURPOSE: uint256</text>
-<polyline fill="none" stroke="black" points="0,-313.5 309.19,-313.5 "/>
-<text text-anchor="start" x="8" y="-296.9" font-family="Times,serif" font-size="14.00">Internal:</text>
-<text text-anchor="start" x="8" y="-280.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;owner(): address</text>
-<text text-anchor="start" x="8" y="-263.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_msgSender(): address</text>
-<text text-anchor="start" x="8" y="-246.5" font-family="Times,serif" font-size="14.00">Public:</text>
-<text text-anchor="start" x="8" y="-229.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;modifier&gt;&gt; onlyOwner()</text>
-</g>
-<!-- 67 -->
+<polygon fill="#f2f2f2" stroke="black" points="163.04,-221.5 163.04,-531.1 472.24,-531.1 472.24,-221.5 163.04,-221.5"/>
+<text text-anchor="middle" x="317.64" y="-514.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Abstract&gt;&gt;</text>
+<text text-anchor="middle" x="317.64" y="-497.7" font-family="Times,serif" font-size="14.00">FacetBase</text>
+<text text-anchor="middle" x="317.64" y="-480.9" font-family="Times,serif" font-size="14.00">contracts/abstract/FacetBase.sol</text>
+<polyline fill="none" stroke="black" points="163.04,-472.7 472.24,-472.7 "/>
+<text text-anchor="start" x="171.04" y="-456.1" font-family="Times,serif" font-size="14.00">Internal:</text>
+<text text-anchor="start" x="171.04" y="-439.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;CONTRIBUTION_DEADLINE_RATIO: uint256</text>
+<text text-anchor="start" x="171.04" y="-422.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;REVEAL_DEADLINE_RATIO: uint256</text>
+<text text-anchor="start" x="171.04" y="-405.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;FINAL_DEADLINE_RATIO: uint256</text>
+<text text-anchor="start" x="171.04" y="-388.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;WORKERPOOL_STAKE_RATIO: uint256</text>
+<text text-anchor="start" x="171.04" y="-372.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;KITTY_RATIO: uint256</text>
+<text text-anchor="start" x="171.04" y="-355.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;KITTY_MIN: uint256</text>
+<text text-anchor="start" x="171.04" y="-338.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;KITTY_ADDRESS: address</text>
+<text text-anchor="start" x="171.04" y="-321.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;GROUPMEMBER_PURPOSE: uint256</text>
+<polyline fill="none" stroke="black" points="163.04,-313.5 472.24,-313.5 "/>
+<text text-anchor="start" x="171.04" y="-296.9" font-family="Times,serif" font-size="14.00">Internal:</text>
+<text text-anchor="start" x="171.04" y="-280.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;owner(): address</text>
+<text text-anchor="start" x="171.04" y="-263.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_msgSender(): address</text>
+<text text-anchor="start" x="171.04" y="-246.5" font-family="Times,serif" font-size="14.00">Public:</text>
+<text text-anchor="start" x="171.04" y="-229.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;modifier&gt;&gt; onlyOwner()</text>
+</g>
+<!-- 68 -->
 <g id="node2" class="node">
-<title>67</title>
-<polygon fill="#f2f2f2" stroke="black" points="327.39,-326.3 327.39,-426.3 661.81,-426.3 661.81,-326.3 327.39,-326.3"/>
-<text text-anchor="middle" x="494.6" y="-409.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
-<text text-anchor="middle" x="494.6" y="-392.9" font-family="Times,serif" font-size="14.00">IOracleConsumer</text>
-<text text-anchor="middle" x="494.6" y="-376.1" font-family="Times,serif" font-size="14.00">contracts/external/interfaces/IOracleConsumer.sol</text>
-<polyline fill="none" stroke="black" points="327.39,-367.9 661.81,-367.9 "/>
-<text text-anchor="start" x="335.39" y="-351.3" font-family="Times,serif" font-size="14.00">External:</text>
-<text text-anchor="start" x="335.39" y="-334.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;receiveResult(taskId: bytes32, resultsCallback: bytes)</text>
+<title>68</title>
+<polygon fill="#f2f2f2" stroke="black" points="490.43,-326.3 490.43,-426.3 824.85,-426.3 824.85,-326.3 490.43,-326.3"/>
+<text text-anchor="middle" x="657.64" y="-409.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
+<text text-anchor="middle" x="657.64" y="-392.9" font-family="Times,serif" font-size="14.00">IOracleConsumer</text>
+<text text-anchor="middle" x="657.64" y="-376.1" font-family="Times,serif" font-size="14.00">contracts/external/interfaces/IOracleConsumer.sol</text>
+<polyline fill="none" stroke="black" points="490.43,-367.9 824.85,-367.9 "/>
+<text text-anchor="start" x="498.43" y="-351.3" font-family="Times,serif" font-size="14.00">External:</text>
+<text text-anchor="start" x="498.43" y="-334.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;receiveResult(taskId: bytes32, resultsCallback: bytes)</text>
 </g>
 <!-- 15 -->
 <g id="node3" class="node">
 <title>15</title>
-<polygon fill="#f2f2f2" stroke="black" points="1466.51,-0.5 1466.51,-184.5 2872.69,-184.5 2872.69,-0.5 1466.51,-0.5"/>
-<text text-anchor="middle" x="2169.6" y="-167.9" font-family="Times,serif" font-size="14.00">IexecPocoBoostFacet</text>
-<text text-anchor="middle" x="2169.6" y="-151.1" font-family="Times,serif" font-size="14.00">contracts/facets/IexecPocoBoostFacet.sol</text>
-<polyline fill="none" stroke="black" points="1466.51,-142.9 2872.69,-142.9 "/>
-<text text-anchor="start" x="1474.51" y="-126.3" font-family="Times,serif" font-size="14.00">Private:</text>
-<text text-anchor="start" x="1474.51" y="-109.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_matchOrdersBoost(appOrder: IexecLibOrders_v5.AppOrder, datasetOrder: IexecLibOrders_v5.DatasetOrder, workerpoolOrder: IexecLibOrders_v5.WorkerpoolOrder, requestOrder: IexecLibOrders_v5.RequestOrder, sponsor: address): bytes32</text>
-<text text-anchor="start" x="1474.51" y="-92.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;requireTaskExistsAndUnset(taskStatus: IexecLibCore_v5.TaskStatusEnum, taskIndex: uint256, botSize: uint16)</text>
-<text text-anchor="start" x="1474.51" y="-75.9" font-family="Times,serif" font-size="14.00">External:</text>
-<text text-anchor="start" x="1474.51" y="-59.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;matchOrdersBoost(appOrder: IexecLibOrders_v5.AppOrder, datasetOrder: IexecLibOrders_v5.DatasetOrder, workerpoolOrder: IexecLibOrders_v5.WorkerpoolOrder, requestOrder: IexecLibOrders_v5.RequestOrder): bytes32</text>
-<text text-anchor="start" x="1474.51" y="-42.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;sponsorMatchOrdersBoost(appOrder: IexecLibOrders_v5.AppOrder, datasetOrder: IexecLibOrders_v5.DatasetOrder, workerpoolOrder: IexecLibOrders_v5.WorkerpoolOrder, requestOrder: IexecLibOrders_v5.RequestOrder): bytes32</text>
-<text text-anchor="start" x="1474.51" y="-25.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;pushResultBoost(dealId: bytes32, index: uint256, results: bytes, resultsCallback: bytes, authorizationSign: bytes, enclaveChallenge: address, enclaveSign: bytes)</text>
-<text text-anchor="start" x="1474.51" y="-8.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;claimBoost(dealId: bytes32, index: uint256)</text>
+<polygon fill="#f2f2f2" stroke="black" points="1629.55,-0.5 1629.55,-184.5 3035.73,-184.5 3035.73,-0.5 1629.55,-0.5"/>
+<text text-anchor="middle" x="2332.64" y="-167.9" font-family="Times,serif" font-size="14.00">IexecPocoBoostFacet</text>
+<text text-anchor="middle" x="2332.64" y="-151.1" font-family="Times,serif" font-size="14.00">contracts/facets/IexecPocoBoostFacet.sol</text>
+<polyline fill="none" stroke="black" points="1629.55,-142.9 3035.73,-142.9 "/>
+<text text-anchor="start" x="1637.55" y="-126.3" font-family="Times,serif" font-size="14.00">Private:</text>
+<text text-anchor="start" x="1637.55" y="-109.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_matchOrdersBoost(appOrder: IexecLibOrders_v5.AppOrder, datasetOrder: IexecLibOrders_v5.DatasetOrder, workerpoolOrder: IexecLibOrders_v5.WorkerpoolOrder, requestOrder: IexecLibOrders_v5.RequestOrder, sponsor: address): bytes32</text>
+<text text-anchor="start" x="1637.55" y="-92.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;requireTaskExistsAndUnset(taskStatus: IexecLibCore_v5.TaskStatusEnum, taskIndex: uint256, botSize: uint16)</text>
+<text text-anchor="start" x="1637.55" y="-75.9" font-family="Times,serif" font-size="14.00">External:</text>
+<text text-anchor="start" x="1637.55" y="-59.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;matchOrdersBoost(appOrder: IexecLibOrders_v5.AppOrder, datasetOrder: IexecLibOrders_v5.DatasetOrder, workerpoolOrder: IexecLibOrders_v5.WorkerpoolOrder, requestOrder: IexecLibOrders_v5.RequestOrder): bytes32</text>
+<text text-anchor="start" x="1637.55" y="-42.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;sponsorMatchOrdersBoost(appOrder: IexecLibOrders_v5.AppOrder, datasetOrder: IexecLibOrders_v5.DatasetOrder, workerpoolOrder: IexecLibOrders_v5.WorkerpoolOrder, requestOrder: IexecLibOrders_v5.RequestOrder): bytes32</text>
+<text text-anchor="start" x="1637.55" y="-25.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;pushResultBoost(dealId: bytes32, index: uint256, results: bytes, resultsCallback: bytes, authorizationSign: bytes, enclaveChallenge: address, enclaveSign: bytes)</text>
+<text text-anchor="start" x="1637.55" y="-8.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;claimBoost(dealId: bytes32, index: uint256)</text>
 </g>
 <!-- 15&#45;&gt;3 -->
 <g id="edge2" class="edge">
 <title>15&#45;&gt;3</title>
-<path fill="none" stroke="black" d="M1466.47,-119.21C1019.85,-139.17 498.05,-170.47 337.67,-215.6"/>
-<polygon fill="none" stroke="black" points="334.22,-205.68 309.26,-225.36 341.05,-225.54 334.22,-205.68"/>
+<path fill="none" stroke="black" d="M1629.51,-119.21C1182.89,-139.17 661.09,-170.47 500.71,-215.6"/>
+<polygon fill="none" stroke="black" points="497.26,-205.68 472.3,-225.36 504.09,-225.54 497.26,-205.68"/>
 </g>
-<!-- 15&#45;&gt;67 -->
+<!-- 15&#45;&gt;68 -->
 <g id="edge16" class="edge">
-<title>15&#45;&gt;67</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1466.25,-112.71C1151.05,-129.61 818.45,-161.35 675.6,-221 624.19,-242.46 576.7,-284.15 543.28,-318.79"/>
-<polygon fill="black" stroke="black" points="540.71,-316.41 536.36,-326.07 545.79,-321.23 540.71,-316.41"/>
+<title>15&#45;&gt;68</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1629.29,-112.71C1314.09,-129.61 981.49,-161.35 838.64,-221 787.23,-242.46 739.74,-284.15 706.32,-318.79"/>
+<polygon fill="black" stroke="black" points="703.75,-316.41 699.4,-326.07 708.83,-321.23 703.75,-316.41"/>
 </g>
 <!-- 30 -->
 <g id="node5" class="node">
 <title>30</title>
-<polygon fill="#f2f2f2" stroke="black" points="793.67,-250.7 793.67,-501.9 2141.53,-501.9 2141.53,-250.7 793.67,-250.7"/>
-<text text-anchor="middle" x="1467.6" y="-485.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
-<text text-anchor="middle" x="1467.6" y="-468.5" font-family="Times,serif" font-size="14.00">IexecPocoBoost</text>
-<text text-anchor="middle" x="1467.6" y="-451.7" font-family="Times,serif" font-size="14.00">contracts/interfaces/IexecPocoBoost.sol</text>
-<polyline fill="none" stroke="black" points="793.67,-443.5 2141.53,-443.5 "/>
-<text text-anchor="start" x="801.67" y="-426.9" font-family="Times,serif" font-size="14.00">External:</text>
-<text text-anchor="start" x="801.67" y="-410.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;matchOrdersBoost(appOrder: IexecLibOrders_v5.AppOrder, datasetOrder: IexecLibOrders_v5.DatasetOrder, workerpoolOrder: IexecLibOrders_v5.WorkerpoolOrder, requestOrder: IexecLibOrders_v5.RequestOrder): bytes32</text>
-<text text-anchor="start" x="801.67" y="-393.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;sponsorMatchOrdersBoost(appOrder: IexecLibOrders_v5.AppOrder, datasetOrder: IexecLibOrders_v5.DatasetOrder, workerpoolOrder: IexecLibOrders_v5.WorkerpoolOrder, requestOrder: IexecLibOrders_v5.RequestOrder): bytes32</text>
-<text text-anchor="start" x="801.67" y="-376.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;pushResultBoost(dealId: bytes32, index: uint256, results: bytes, resultsCallback: bytes, authorizationSign: bytes, enclaveChallenge: address, enclaveSign: bytes)</text>
-<text text-anchor="start" x="801.67" y="-359.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;claimBoost(dealId: bytes32, index: uint256)</text>
-<text text-anchor="start" x="801.67" y="-342.9" font-family="Times,serif" font-size="14.00">Public:</text>
-<text text-anchor="start" x="801.67" y="-326.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; SchedulerNoticeBoost(workerpool: address, dealId: bytes32, app: address, dataset: address, category: uint256, tag: bytes32, params: string, beneficiary: address)</text>
-<text text-anchor="start" x="801.67" y="-309.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; OrdersMatched(dealid: bytes32, appHash: bytes32, datasetHash: bytes32, workerpoolHash: bytes32, requestHash: bytes32, volume: uint256)</text>
-<text text-anchor="start" x="801.67" y="-292.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; ResultPushedBoost(dealId: bytes32, index: uint256, results: bytes)</text>
-<text text-anchor="start" x="801.67" y="-275.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; TaskClaimed(taskid: bytes32)</text>
-<text text-anchor="start" x="801.67" y="-258.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; DealSponsoredBoost(dealId: bytes32, sponsor: address)</text>
+<polygon fill="#f2f2f2" stroke="black" points="956.71,-250.7 956.71,-501.9 2304.57,-501.9 2304.57,-250.7 956.71,-250.7"/>
+<text text-anchor="middle" x="1630.64" y="-485.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
+<text text-anchor="middle" x="1630.64" y="-468.5" font-family="Times,serif" font-size="14.00">IexecPocoBoost</text>
+<text text-anchor="middle" x="1630.64" y="-451.7" font-family="Times,serif" font-size="14.00">contracts/interfaces/IexecPocoBoost.sol</text>
+<polyline fill="none" stroke="black" points="956.71,-443.5 2304.57,-443.5 "/>
+<text text-anchor="start" x="964.71" y="-426.9" font-family="Times,serif" font-size="14.00">External:</text>
+<text text-anchor="start" x="964.71" y="-410.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;matchOrdersBoost(appOrder: IexecLibOrders_v5.AppOrder, datasetOrder: IexecLibOrders_v5.DatasetOrder, workerpoolOrder: IexecLibOrders_v5.WorkerpoolOrder, requestOrder: IexecLibOrders_v5.RequestOrder): bytes32</text>
+<text text-anchor="start" x="964.71" y="-393.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;sponsorMatchOrdersBoost(appOrder: IexecLibOrders_v5.AppOrder, datasetOrder: IexecLibOrders_v5.DatasetOrder, workerpoolOrder: IexecLibOrders_v5.WorkerpoolOrder, requestOrder: IexecLibOrders_v5.RequestOrder): bytes32</text>
+<text text-anchor="start" x="964.71" y="-376.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;pushResultBoost(dealId: bytes32, index: uint256, results: bytes, resultsCallback: bytes, authorizationSign: bytes, enclaveChallenge: address, enclaveSign: bytes)</text>
+<text text-anchor="start" x="964.71" y="-359.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;claimBoost(dealId: bytes32, index: uint256)</text>
+<text text-anchor="start" x="964.71" y="-342.9" font-family="Times,serif" font-size="14.00">Public:</text>
+<text text-anchor="start" x="964.71" y="-326.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; SchedulerNoticeBoost(workerpool: address, dealId: bytes32, app: address, dataset: address, category: uint256, tag: bytes32, params: string, beneficiary: address)</text>
+<text text-anchor="start" x="964.71" y="-309.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; OrdersMatched(dealid: bytes32, appHash: bytes32, datasetHash: bytes32, workerpoolHash: bytes32, requestHash: bytes32, volume: uint256)</text>
+<text text-anchor="start" x="964.71" y="-292.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; ResultPushedBoost(dealId: bytes32, index: uint256, results: bytes)</text>
+<text text-anchor="start" x="964.71" y="-275.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; TaskClaimed(taskid: bytes32)</text>
+<text text-anchor="start" x="964.71" y="-258.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; DealSponsoredBoost(dealId: bytes32, sponsor: address)</text>
 </g>
 <!-- 15&#45;&gt;30 -->
 <g id="edge1" class="edge">
 <title>15&#45;&gt;30</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1942.65,-184.6C1898.98,-202.13 1852.38,-220.84 1806.07,-239.43"/>
-<polygon fill="none" stroke="black" points="1802.02,-229.74 1778.09,-250.66 1809.84,-249.23 1802.02,-229.74"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2105.69,-184.6C2062.03,-202.13 2015.43,-220.84 1969.12,-239.43"/>
+<polygon fill="none" stroke="black" points="1965.06,-229.74 1941.13,-250.66 1972.88,-249.23 1965.06,-229.74"/>
 </g>
 <!-- 34 -->
 <g id="node6" class="node">
 <title>34</title>
-<polygon fill="#f2f2f2" stroke="black" points="2235.52,-255.1 2235.52,-497.5 4131.67,-497.5 4131.67,-255.1 2235.52,-255.1"/>
-<text text-anchor="middle" x="3183.6" y="-480.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
-<text text-anchor="middle" x="3183.6" y="-464.1" font-family="Times,serif" font-size="14.00">CommonLib</text>
-<text text-anchor="middle" x="3183.6" y="-447.3" font-family="Times,serif" font-size="14.00">contracts/libs/CommonLib.sol</text>
-<polyline fill="none" stroke="black" points="2235.52,-439.1 4131.67,-439.1 "/>
-<text text-anchor="start" x="2243.52" y="-422.5" font-family="Times,serif" font-size="14.00">Private:</text>
-<text text-anchor="start" x="2243.52" y="-405.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;GROUPMEMBER_PURPOSE: uint256</text>
-<polyline fill="none" stroke="black" points="2235.52,-397.5 4131.67,-397.5 "/>
-<text text-anchor="start" x="2243.52" y="-380.9" font-family="Times,serif" font-size="14.00">Internal:</text>
-<text text-anchor="start" x="2243.52" y="-364.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;toTypedDataHash(structHash: bytes32): bytes32</text>
-<text text-anchor="start" x="2243.52" y="-347.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;verifySignatureOfEthSignedMessage(account: address, message: bytes, signature: bytes): bool</text>
-<text text-anchor="start" x="2243.52" y="-330.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;verifySignature(account: address, messageHash: bytes32, signature: bytes): bool</text>
-<text text-anchor="start" x="2243.52" y="-313.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;verifyPresignature(account: address, messageHash: bytes32): bool</text>
-<text text-anchor="start" x="2243.52" y="-296.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;verifySignatureOrPresignature(account: address, messageHash: bytes32, signature: bytes): bool</text>
-<text text-anchor="start" x="2243.52" y="-280.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;isAccountAuthorizedByRestriction(restriction: address, account: address): bool</text>
-<text text-anchor="start" x="2243.52" y="-263.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;computeDealVolume(appOrderVolume: uint256, appOrderTypedDataHash: bytes32, hasDataset: bool, datasetOrderVolume: uint256, datasetOrderTypedDataHash: bytes32, workerpoolOrderVolume: uint256, workerpoolOrderTypedDataHash: bytes32, requestOrderVolume: uint256, requestOrderTypedDataHash: bytes32): uint256</text>
+<polygon fill="#f2f2f2" stroke="black" points="1828.56,-652.1 1828.56,-894.5 3724.72,-894.5 3724.72,-652.1 1828.56,-652.1"/>
+<text text-anchor="middle" x="2776.64" y="-877.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
+<text text-anchor="middle" x="2776.64" y="-861.1" font-family="Times,serif" font-size="14.00">CommonLib</text>
+<text text-anchor="middle" x="2776.64" y="-844.3" font-family="Times,serif" font-size="14.00">contracts/libs/CommonLib.sol</text>
+<polyline fill="none" stroke="black" points="1828.56,-836.1 3724.72,-836.1 "/>
+<text text-anchor="start" x="1836.56" y="-819.5" font-family="Times,serif" font-size="14.00">Private:</text>
+<text text-anchor="start" x="1836.56" y="-802.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;GROUPMEMBER_PURPOSE: uint256</text>
+<polyline fill="none" stroke="black" points="1828.56,-794.5 3724.72,-794.5 "/>
+<text text-anchor="start" x="1836.56" y="-777.9" font-family="Times,serif" font-size="14.00">Internal:</text>
+<text text-anchor="start" x="1836.56" y="-761.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;toTypedDataHash(structHash: bytes32): bytes32</text>
+<text text-anchor="start" x="1836.56" y="-744.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;verifySignatureOfEthSignedMessage(account: address, message: bytes, signature: bytes): bool</text>
+<text text-anchor="start" x="1836.56" y="-727.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;verifySignature(account: address, messageHash: bytes32, signature: bytes): bool</text>
+<text text-anchor="start" x="1836.56" y="-710.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;verifyPresignature(account: address, messageHash: bytes32): bool</text>
+<text text-anchor="start" x="1836.56" y="-693.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;verifySignatureOrPresignature(account: address, messageHash: bytes32, signature: bytes): bool</text>
+<text text-anchor="start" x="1836.56" y="-677.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;isAccountAuthorizedByRestriction(restriction: address, account: address): bool</text>
+<text text-anchor="start" x="1836.56" y="-660.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;computeDealVolume(appOrderVolume: uint256, appOrderTypedDataHash: bytes32, hasDataset: bool, datasetOrderVolume: uint256, datasetOrderTypedDataHash: bytes32, workerpoolOrderVolume: uint256, workerpoolOrderTypedDataHash: bytes32, requestOrderVolume: uint256, requestOrderTypedDataHash: bytes32): uint256</text>
 </g>
 <!-- 15&#45;&gt;34 -->
 <g id="edge10" class="edge">
 <title>15&#45;&gt;34</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2497.06,-184.51C2574.78,-206.1 2658.96,-229.5 2740.86,-252.26"/>
-<polygon fill="black" stroke="black" points="2740.26,-255.73 2750.84,-255.03 2742.14,-248.98 2740.26,-255.73"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2392.29,-184.69C2469.47,-302.69 2604.4,-508.98 2692.12,-643.08"/>
+<polygon fill="black" stroke="black" points="2689.42,-645.35 2697.82,-651.81 2695.28,-641.52 2689.42,-645.35"/>
 </g>
 <!-- 35 -->
 <g id="node7" class="node">
 <title>35</title>
-<polygon fill="#f2f2f2" stroke="black" points="4187.96,-233.9 4187.96,-518.7 4593.23,-518.7 4593.23,-233.9 4187.96,-233.9"/>
-<text text-anchor="middle" x="4390.6" y="-502.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
-<text text-anchor="middle" x="4390.6" y="-485.3" font-family="Times,serif" font-size="14.00">EscrowLib</text>
-<text text-anchor="middle" x="4390.6" y="-468.5" font-family="Times,serif" font-size="14.00">contracts/libs/EscrowLib.sol</text>
-<polyline fill="none" stroke="black" points="4187.96,-460.3 4593.23,-460.3 "/>
-<text text-anchor="start" x="4195.96" y="-443.7" font-family="Times,serif" font-size="14.00">Internal:</text>
-<text text-anchor="start" x="4195.96" y="-426.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;lock(account: address, value: uint256)</text>
-<text text-anchor="start" x="4195.96" y="-410.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;unlock(account: address, value: uint256)</text>
-<text text-anchor="start" x="4195.96" y="-393.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;reward(account: address, value: uint256, ref: bytes32)</text>
-<text text-anchor="start" x="4195.96" y="-376.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;seize(account: address, value: uint256, ref: bytes32)</text>
-<text text-anchor="start" x="4195.96" y="-359.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;rewardAndLock(account: address, value: uint256, ref: bytes32)</text>
-<text text-anchor="start" x="4195.96" y="-342.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;transfer(from: address, to: address, value: uint256)</text>
-<text text-anchor="start" x="4195.96" y="-326.1" font-family="Times,serif" font-size="14.00">Public:</text>
-<text text-anchor="start" x="4195.96" y="-309.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Transfer(from: address, to: address, value: uint256)</text>
-<text text-anchor="start" x="4195.96" y="-292.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Reward(owner: address, amount: uint256, ref: bytes32)</text>
-<text text-anchor="start" x="4195.96" y="-275.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Seize(owner: address, amount: uint256, ref: bytes32)</text>
-<text text-anchor="start" x="4195.96" y="-258.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Lock(owner: address, amount: uint256)</text>
-<text text-anchor="start" x="4195.96" y="-242.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Unlock(owner: address, amount: uint256)</text>
+<polygon fill="#f2f2f2" stroke="black" points="3806.01,-250.7 3806.01,-501.9 4211.27,-501.9 4211.27,-250.7 3806.01,-250.7"/>
+<text text-anchor="middle" x="4008.64" y="-485.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
+<text text-anchor="middle" x="4008.64" y="-468.5" font-family="Times,serif" font-size="14.00">EscrowLib</text>
+<text text-anchor="middle" x="4008.64" y="-451.7" font-family="Times,serif" font-size="14.00">contracts/libs/EscrowLib.sol</text>
+<polyline fill="none" stroke="black" points="3806.01,-443.5 4211.27,-443.5 "/>
+<text text-anchor="start" x="3814.01" y="-426.9" font-family="Times,serif" font-size="14.00">Internal:</text>
+<text text-anchor="start" x="3814.01" y="-410.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;lock(account: address, value: uint256)</text>
+<text text-anchor="start" x="3814.01" y="-393.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;unlock(account: address, value: uint256)</text>
+<text text-anchor="start" x="3814.01" y="-376.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;reward(account: address, value: uint256, ref: bytes32)</text>
+<text text-anchor="start" x="3814.01" y="-359.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;seize(account: address, value: uint256, ref: bytes32)</text>
+<text text-anchor="start" x="3814.01" y="-342.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;rewardAndLock(account: address, value: uint256, ref: bytes32)</text>
+<text text-anchor="start" x="3814.01" y="-326.1" font-family="Times,serif" font-size="14.00">Public:</text>
+<text text-anchor="start" x="3814.01" y="-309.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Reward(owner: address, amount: uint256, ref: bytes32)</text>
+<text text-anchor="start" x="3814.01" y="-292.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Seize(owner: address, amount: uint256, ref: bytes32)</text>
+<text text-anchor="start" x="3814.01" y="-275.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Lock(owner: address, amount: uint256)</text>
+<text text-anchor="start" x="3814.01" y="-258.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Unlock(owner: address, amount: uint256)</text>
 </g>
 <!-- 15&#45;&gt;35 -->
 <g id="edge14" class="edge">
 <title>15&#45;&gt;35</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2872.75,-119.37C3400.4,-141.96 4051.95,-177.86 4173.6,-221 4180.71,-223.52 4187.8,-226.35 4194.84,-229.44"/>
-<polygon fill="black" stroke="black" points="4193.85,-232.83 4204.4,-233.8 4196.76,-226.47 4193.85,-232.83"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3036.11,-124.87C3328.38,-144.35 3630.81,-174.76 3766.64,-221 3786.29,-227.69 3805.95,-236.29 3825.1,-245.99"/>
+<polygon fill="black" stroke="black" points="3823.66,-249.19 3834.15,-250.69 3826.88,-242.98 3823.66,-249.19"/>
 </g>
 <!-- 36 -->
 <g id="node8" class="node">
 <title>36</title>
-<polygon fill="#f2f2f2" stroke="black" points="4677.43,-1677.3 4677.43,-1735.7 4889.76,-1735.7 4889.76,-1677.3 4677.43,-1677.3"/>
-<text text-anchor="middle" x="4783.6" y="-1719.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
-<text text-anchor="middle" x="4783.6" y="-1702.3" font-family="Times,serif" font-size="14.00">IexecLibCore_v5</text>
-<text text-anchor="middle" x="4783.6" y="-1685.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polygon fill="#f2f2f2" stroke="black" points="4372.47,-1915.1 4372.47,-1973.5 4584.81,-1973.5 4584.81,-1915.1 4372.47,-1915.1"/>
+<text text-anchor="middle" x="4478.64" y="-1956.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
+<text text-anchor="middle" x="4478.64" y="-1940.1" font-family="Times,serif" font-size="14.00">IexecLibCore_v5</text>
+<text text-anchor="middle" x="4478.64" y="-1923.3" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
 </g>
 <!-- 15&#45;&gt;36 -->
 <g id="edge11" class="edge">
 <title>15&#45;&gt;36</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2873.01,-109.69C3622.03,-129.65 4711.05,-167.6 4789.6,-221 5026.47,-382.03 5020.65,-1231.17 4928.6,-1502.4 4906.24,-1568.28 4854.88,-1631.42 4819.7,-1669.34"/>
-<polygon fill="black" stroke="black" points="4816.75,-1667.36 4812.45,-1677.04 4821.85,-1672.16 4816.75,-1667.36"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3036.04,-118.48C3576.44,-141 4238.39,-177.25 4284.64,-221 4397.36,-327.64 4317.29,-412.71 4326.64,-567.6 4337.66,-750.11 4328.27,-796.16 4326.64,-979 4324.89,-1174.29 4219.45,-1690.16 4319.64,-1857.8 4329.38,-1874.1 4365.52,-1894.12 4400.89,-1910.7"/>
+<polygon fill="black" stroke="black" points="4399.79,-1914.04 4410.33,-1915.05 4402.72,-1907.69 4399.79,-1914.04"/>
 </g>
 <!-- 44 -->
 <g id="node9" class="node">
 <title>44</title>
-<polygon fill="#f2f2f2" stroke="black" points="4447.43,-1107.9 4447.43,-1409.5 4659.76,-1409.5 4659.76,-1107.9 4447.43,-1107.9"/>
-<text text-anchor="middle" x="4553.6" y="-1392.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="4553.6" y="-1376.1" font-family="Times,serif" font-size="14.00">DealBoost</text>
-<text text-anchor="middle" x="4553.6" y="-1359.3" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
-<polyline fill="none" stroke="black" points="4447.43,-1351.1 4659.76,-1351.1 "/>
-<text text-anchor="start" x="4455.43" y="-1334.5" font-family="Times,serif" font-size="14.00">appOwner: address</text>
-<text text-anchor="start" x="4455.43" y="-1317.7" font-family="Times,serif" font-size="14.00">appPrice: uint96</text>
-<text text-anchor="start" x="4455.43" y="-1300.9" font-family="Times,serif" font-size="14.00">datasetOwner: address</text>
-<text text-anchor="start" x="4455.43" y="-1284.1" font-family="Times,serif" font-size="14.00">datasetPrice: uint96</text>
-<text text-anchor="start" x="4455.43" y="-1267.3" font-family="Times,serif" font-size="14.00">workerpoolOwner: address</text>
-<text text-anchor="start" x="4455.43" y="-1250.5" font-family="Times,serif" font-size="14.00">workerpoolPrice: uint96</text>
-<text text-anchor="start" x="4455.43" y="-1233.7" font-family="Times,serif" font-size="14.00">requester: address</text>
-<text text-anchor="start" x="4455.43" y="-1216.9" font-family="Times,serif" font-size="14.00">workerReward: uint96</text>
-<text text-anchor="start" x="4455.43" y="-1200.1" font-family="Times,serif" font-size="14.00">callback: address</text>
-<text text-anchor="start" x="4455.43" y="-1183.3" font-family="Times,serif" font-size="14.00">deadline: uint40</text>
-<text text-anchor="start" x="4455.43" y="-1166.5" font-family="Times,serif" font-size="14.00">botFirst: uint16</text>
-<text text-anchor="start" x="4455.43" y="-1149.7" font-family="Times,serif" font-size="14.00">botSize: uint16</text>
-<text text-anchor="start" x="4455.43" y="-1132.9" font-family="Times,serif" font-size="14.00">shortTag: bytes3</text>
-<text text-anchor="start" x="4455.43" y="-1116.1" font-family="Times,serif" font-size="14.00">sponsor: address</text>
+<polygon fill="#f2f2f2" stroke="black" points="4328.47,-1463.3 4328.47,-1764.9 4540.81,-1764.9 4540.81,-1463.3 4328.47,-1463.3"/>
+<text text-anchor="middle" x="4434.64" y="-1748.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="4434.64" y="-1731.5" font-family="Times,serif" font-size="14.00">DealBoost</text>
+<text text-anchor="middle" x="4434.64" y="-1714.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polyline fill="none" stroke="black" points="4328.47,-1706.5 4540.81,-1706.5 "/>
+<text text-anchor="start" x="4336.47" y="-1689.9" font-family="Times,serif" font-size="14.00">appOwner: address</text>
+<text text-anchor="start" x="4336.47" y="-1673.1" font-family="Times,serif" font-size="14.00">appPrice: uint96</text>
+<text text-anchor="start" x="4336.47" y="-1656.3" font-family="Times,serif" font-size="14.00">datasetOwner: address</text>
+<text text-anchor="start" x="4336.47" y="-1639.5" font-family="Times,serif" font-size="14.00">datasetPrice: uint96</text>
+<text text-anchor="start" x="4336.47" y="-1622.7" font-family="Times,serif" font-size="14.00">workerpoolOwner: address</text>
+<text text-anchor="start" x="4336.47" y="-1605.9" font-family="Times,serif" font-size="14.00">workerpoolPrice: uint96</text>
+<text text-anchor="start" x="4336.47" y="-1589.1" font-family="Times,serif" font-size="14.00">requester: address</text>
+<text text-anchor="start" x="4336.47" y="-1572.3" font-family="Times,serif" font-size="14.00">workerReward: uint96</text>
+<text text-anchor="start" x="4336.47" y="-1555.5" font-family="Times,serif" font-size="14.00">callback: address</text>
+<text text-anchor="start" x="4336.47" y="-1538.7" font-family="Times,serif" font-size="14.00">deadline: uint40</text>
+<text text-anchor="start" x="4336.47" y="-1521.9" font-family="Times,serif" font-size="14.00">botFirst: uint16</text>
+<text text-anchor="start" x="4336.47" y="-1505.1" font-family="Times,serif" font-size="14.00">botSize: uint16</text>
+<text text-anchor="start" x="4336.47" y="-1488.3" font-family="Times,serif" font-size="14.00">shortTag: bytes3</text>
+<text text-anchor="start" x="4336.47" y="-1471.5" font-family="Times,serif" font-size="14.00">sponsor: address</text>
 </g>
 <!-- 15&#45;&gt;44 -->
 <g id="edge12" class="edge">
 <title>15&#45;&gt;44</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2872.72,-106.49C3577.94,-123.06 4568.31,-157.51 4628.6,-221 4687.53,-283.07 4617.92,-822.5 4577.93,-1097.68"/>
-<polygon fill="black" stroke="black" points="4574.44,-1097.36 4576.46,-1107.76 4581.36,-1098.37 4574.44,-1097.36"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3035.96,-115.48C3604.91,-136.73 4319.36,-172.79 4366.64,-221 4409.99,-265.2 4411.09,-1272.59 4414.64,-1334.4 4416.84,-1372.74 4419.59,-1414.03 4422.35,-1452.77"/>
+<polygon fill="black" stroke="black" points="4418.88,-1453.36 4423.08,-1463.09 4425.86,-1452.86 4418.88,-1453.36"/>
 </g>
 <!-- 45 -->
 <g id="node10" class="node">
 <title>45</title>
-<polygon fill="#f2f2f2" stroke="black" points="4677.43,-1183.5 4677.43,-1333.9 4889.76,-1333.9 4889.76,-1183.5 4677.43,-1183.5"/>
-<text text-anchor="middle" x="4783.6" y="-1317.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Enum&gt;&gt;</text>
-<text text-anchor="middle" x="4783.6" y="-1300.5" font-family="Times,serif" font-size="14.00">TaskStatusEnum</text>
-<text text-anchor="middle" x="4783.6" y="-1283.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
-<polyline fill="none" stroke="black" points="4677.43,-1275.5 4889.76,-1275.5 "/>
-<text text-anchor="start" x="4685.43" y="-1258.9" font-family="Times,serif" font-size="14.00">UNSET: 0</text>
-<text text-anchor="start" x="4685.43" y="-1242.1" font-family="Times,serif" font-size="14.00">ACTIVE: 1</text>
-<text text-anchor="start" x="4685.43" y="-1225.3" font-family="Times,serif" font-size="14.00">REVEALING: 2</text>
-<text text-anchor="start" x="4685.43" y="-1208.5" font-family="Times,serif" font-size="14.00">COMPLETED: 3</text>
-<text text-anchor="start" x="4685.43" y="-1191.7" font-family="Times,serif" font-size="14.00">FAILED: 4</text>
+<polygon fill="#f2f2f2" stroke="black" points="4558.47,-1538.9 4558.47,-1689.3 4770.81,-1689.3 4770.81,-1538.9 4558.47,-1538.9"/>
+<text text-anchor="middle" x="4664.64" y="-1672.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Enum&gt;&gt;</text>
+<text text-anchor="middle" x="4664.64" y="-1655.9" font-family="Times,serif" font-size="14.00">TaskStatusEnum</text>
+<text text-anchor="middle" x="4664.64" y="-1639.1" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polyline fill="none" stroke="black" points="4558.47,-1630.9 4770.81,-1630.9 "/>
+<text text-anchor="start" x="4566.47" y="-1614.3" font-family="Times,serif" font-size="14.00">UNSET: 0</text>
+<text text-anchor="start" x="4566.47" y="-1597.5" font-family="Times,serif" font-size="14.00">ACTIVE: 1</text>
+<text text-anchor="start" x="4566.47" y="-1580.7" font-family="Times,serif" font-size="14.00">REVEALING: 2</text>
+<text text-anchor="start" x="4566.47" y="-1563.9" font-family="Times,serif" font-size="14.00">COMPLETED: 3</text>
+<text text-anchor="start" x="4566.47" y="-1547.1" font-family="Times,serif" font-size="14.00">FAILED: 4</text>
 </g>
 <!-- 15&#45;&gt;45 -->
 <g id="edge17" class="edge">
 <title>15&#45;&gt;45</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2872.75,-107.1C3584.65,-124.27 4589.9,-159.29 4653.6,-221 4714.29,-279.81 4703.18,-895.56 4716.6,-979 4727.22,-1045.05 4745.16,-1118.58 4759.8,-1173.52"/>
-<polygon fill="black" stroke="black" points="4756.43,-1174.46 4762.4,-1183.21 4763.19,-1172.65 4756.43,-1174.46"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3035.82,-115.8C3613.71,-137.44 4345.41,-173.9 4395.64,-221 4411.12,-235.52 4487.5,-958.18 4491.64,-979 4531.37,-1178.96 4599.91,-1408.66 4637.69,-1529.2"/>
+<polygon fill="black" stroke="black" points="4634.35,-1530.26 4640.69,-1538.75 4641.03,-1528.16 4634.35,-1530.26"/>
 </g>
 <!-- 46 -->
 <g id="node11" class="node">
 <title>46</title>
-<polygon fill="#f2f2f2" stroke="black" points="4725.43,-614.1 4725.43,-932.5 4937.76,-932.5 4937.76,-614.1 4725.43,-614.1"/>
-<text text-anchor="middle" x="4831.6" y="-915.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="4831.6" y="-899.1" font-family="Times,serif" font-size="14.00">Task</text>
-<text text-anchor="middle" x="4831.6" y="-882.3" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
-<polyline fill="none" stroke="black" points="4725.43,-874.1 4937.76,-874.1 "/>
-<text text-anchor="start" x="4733.43" y="-857.5" font-family="Times,serif" font-size="14.00">status: TaskStatusEnum</text>
-<text text-anchor="start" x="4733.43" y="-840.7" font-family="Times,serif" font-size="14.00">dealid: bytes32</text>
-<text text-anchor="start" x="4733.43" y="-823.9" font-family="Times,serif" font-size="14.00">idx: uint256</text>
-<text text-anchor="start" x="4733.43" y="-807.1" font-family="Times,serif" font-size="14.00">timeref: uint256</text>
-<text text-anchor="start" x="4733.43" y="-790.3" font-family="Times,serif" font-size="14.00">contributionDeadline: uint256</text>
-<text text-anchor="start" x="4733.43" y="-773.5" font-family="Times,serif" font-size="14.00">revealDeadline: uint256</text>
-<text text-anchor="start" x="4733.43" y="-756.7" font-family="Times,serif" font-size="14.00">finalDeadline: uint256</text>
-<text text-anchor="start" x="4733.43" y="-739.9" font-family="Times,serif" font-size="14.00">consensusValue: bytes32</text>
-<text text-anchor="start" x="4733.43" y="-723.1" font-family="Times,serif" font-size="14.00">revealCounter: uint256</text>
-<text text-anchor="start" x="4733.43" y="-706.3" font-family="Times,serif" font-size="14.00">winnerCounter: uint256</text>
-<text text-anchor="start" x="4733.43" y="-689.5" font-family="Times,serif" font-size="14.00">contributors: address[]</text>
-<text text-anchor="start" x="4733.43" y="-672.7" font-family="Times,serif" font-size="14.00">resultDigest: bytes32</text>
-<text text-anchor="start" x="4733.43" y="-655.9" font-family="Times,serif" font-size="14.00">results: bytes</text>
-<text text-anchor="start" x="4733.43" y="-639.1" font-family="Times,serif" font-size="14.00">resultsTimestamp: uint256</text>
-<text text-anchor="start" x="4733.43" y="-622.3" font-family="Times,serif" font-size="14.00">resultsCallback: bytes</text>
+<polygon fill="#f2f2f2" stroke="black" points="4625.47,-1015.5 4625.47,-1333.9 4837.81,-1333.9 4837.81,-1015.5 4625.47,-1015.5"/>
+<text text-anchor="middle" x="4731.64" y="-1317.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="4731.64" y="-1300.5" font-family="Times,serif" font-size="14.00">Task</text>
+<text text-anchor="middle" x="4731.64" y="-1283.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polyline fill="none" stroke="black" points="4625.47,-1275.5 4837.81,-1275.5 "/>
+<text text-anchor="start" x="4633.47" y="-1258.9" font-family="Times,serif" font-size="14.00">status: TaskStatusEnum</text>
+<text text-anchor="start" x="4633.47" y="-1242.1" font-family="Times,serif" font-size="14.00">dealid: bytes32</text>
+<text text-anchor="start" x="4633.47" y="-1225.3" font-family="Times,serif" font-size="14.00">idx: uint256</text>
+<text text-anchor="start" x="4633.47" y="-1208.5" font-family="Times,serif" font-size="14.00">timeref: uint256</text>
+<text text-anchor="start" x="4633.47" y="-1191.7" font-family="Times,serif" font-size="14.00">contributionDeadline: uint256</text>
+<text text-anchor="start" x="4633.47" y="-1174.9" font-family="Times,serif" font-size="14.00">revealDeadline: uint256</text>
+<text text-anchor="start" x="4633.47" y="-1158.1" font-family="Times,serif" font-size="14.00">finalDeadline: uint256</text>
+<text text-anchor="start" x="4633.47" y="-1141.3" font-family="Times,serif" font-size="14.00">consensusValue: bytes32</text>
+<text text-anchor="start" x="4633.47" y="-1124.5" font-family="Times,serif" font-size="14.00">revealCounter: uint256</text>
+<text text-anchor="start" x="4633.47" y="-1107.7" font-family="Times,serif" font-size="14.00">winnerCounter: uint256</text>
+<text text-anchor="start" x="4633.47" y="-1090.9" font-family="Times,serif" font-size="14.00">contributors: address[]</text>
+<text text-anchor="start" x="4633.47" y="-1074.1" font-family="Times,serif" font-size="14.00">resultDigest: bytes32</text>
+<text text-anchor="start" x="4633.47" y="-1057.3" font-family="Times,serif" font-size="14.00">results: bytes</text>
+<text text-anchor="start" x="4633.47" y="-1040.5" font-family="Times,serif" font-size="14.00">resultsTimestamp: uint256</text>
+<text text-anchor="start" x="4633.47" y="-1023.7" font-family="Times,serif" font-size="14.00">resultsCallback: bytes</text>
 </g>
 <!-- 15&#45;&gt;46 -->
 <g id="edge15" class="edge">
 <title>15&#45;&gt;46</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2872.72,-107.89C3600.68,-125.94 4641.9,-161.9 4711.6,-221 4820.16,-313.06 4844.14,-478.24 4844.58,-603.87"/>
-<polygon fill="black" stroke="black" points="4841.08,-603.98 4844.57,-613.98 4848.08,-603.99 4841.08,-603.98"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3035.85,-114.88C3629.18,-136.21 4390.5,-172.74 4442.64,-221 4493.78,-268.33 4468.28,-464.12 4485.64,-531.6 4528.21,-697.12 4600.1,-878.33 4655.21,-1005.91"/>
+<polygon fill="black" stroke="black" points="4652.12,-1007.6 4659.31,-1015.39 4658.55,-1004.82 4652.12,-1007.6"/>
 </g>
 <!-- 50 -->
 <g id="node12" class="node">
 <title>50</title>
-<polygon fill="#f2f2f2" stroke="black" points="1157.83,-568.1 1157.83,-978.5 1591.36,-978.5 1591.36,-568.1 1157.83,-568.1"/>
-<text text-anchor="middle" x="1374.6" y="-961.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
-<text text-anchor="middle" x="1374.6" y="-945.1" font-family="Times,serif" font-size="14.00">IexecLibOrders_v5</text>
-<text text-anchor="middle" x="1374.6" y="-928.3" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="1157.83,-920.1 1591.36,-920.1 "/>
-<text text-anchor="start" x="1165.83" y="-903.5" font-family="Times,serif" font-size="14.00">Public:</text>
-<text text-anchor="start" x="1165.83" y="-886.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;EIP712DOMAIN_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="1165.83" y="-869.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;APPORDER_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="1165.83" y="-853.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;DATASETORDER_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="1165.83" y="-836.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;WORKERPOOLORDER_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="1165.83" y="-819.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;REQUESTORDER_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="1165.83" y="-802.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;APPORDEROPERATION_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="1165.83" y="-785.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;DATASETORDEROPERATION_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="1165.83" y="-769.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;WORKERPOOLORDEROPERATION_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="1165.83" y="-752.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;REQUESTORDEROPERATION_TYPEHASH: bytes32</text>
-<polyline fill="none" stroke="black" points="1157.83,-744.1 1591.36,-744.1 "/>
-<text text-anchor="start" x="1165.83" y="-727.5" font-family="Times,serif" font-size="14.00">Public:</text>
-<text text-anchor="start" x="1165.83" y="-710.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_domain: EIP712Domain): (domainhash: bytes32)</text>
-<text text-anchor="start" x="1165.83" y="-693.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_apporder: AppOrder): (apphash: bytes32)</text>
-<text text-anchor="start" x="1165.83" y="-677.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_datasetorder: DatasetOrder): (datasethash: bytes32)</text>
-<text text-anchor="start" x="1165.83" y="-660.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_workerpoolorder: WorkerpoolOrder): (workerpoolhash: bytes32)</text>
-<text text-anchor="start" x="1165.83" y="-643.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_requestorder: RequestOrder): (requesthash: bytes32)</text>
-<text text-anchor="start" x="1165.83" y="-626.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_apporderoperation: AppOrderOperation): bytes32</text>
-<text text-anchor="start" x="1165.83" y="-609.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_datasetorderoperation: DatasetOrderOperation): bytes32</text>
-<text text-anchor="start" x="1165.83" y="-593.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_workerpoolorderoperation: WorkerpoolOrderOperation): bytes32</text>
-<text text-anchor="start" x="1165.83" y="-576.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_requestorderoperation: RequestOrderOperation): bytes32</text>
+<polygon fill="#f2f2f2" stroke="black" points="844.87,-568.1 844.87,-978.5 1278.4,-978.5 1278.4,-568.1 844.87,-568.1"/>
+<text text-anchor="middle" x="1061.64" y="-961.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
+<text text-anchor="middle" x="1061.64" y="-945.1" font-family="Times,serif" font-size="14.00">IexecLibOrders_v5</text>
+<text text-anchor="middle" x="1061.64" y="-928.3" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="844.87,-920.1 1278.4,-920.1 "/>
+<text text-anchor="start" x="852.87" y="-903.5" font-family="Times,serif" font-size="14.00">Public:</text>
+<text text-anchor="start" x="852.87" y="-886.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;EIP712DOMAIN_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="852.87" y="-869.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;APPORDER_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="852.87" y="-853.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;DATASETORDER_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="852.87" y="-836.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;WORKERPOOLORDER_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="852.87" y="-819.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;REQUESTORDER_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="852.87" y="-802.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;APPORDEROPERATION_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="852.87" y="-785.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;DATASETORDEROPERATION_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="852.87" y="-769.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;WORKERPOOLORDEROPERATION_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="852.87" y="-752.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;REQUESTORDEROPERATION_TYPEHASH: bytes32</text>
+<polyline fill="none" stroke="black" points="844.87,-744.1 1278.4,-744.1 "/>
+<text text-anchor="start" x="852.87" y="-727.5" font-family="Times,serif" font-size="14.00">Public:</text>
+<text text-anchor="start" x="852.87" y="-710.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_domain: EIP712Domain): (domainhash: bytes32)</text>
+<text text-anchor="start" x="852.87" y="-693.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_apporder: AppOrder): (apphash: bytes32)</text>
+<text text-anchor="start" x="852.87" y="-677.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_datasetorder: DatasetOrder): (datasethash: bytes32)</text>
+<text text-anchor="start" x="852.87" y="-660.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_workerpoolorder: WorkerpoolOrder): (workerpoolhash: bytes32)</text>
+<text text-anchor="start" x="852.87" y="-643.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_requestorder: RequestOrder): (requesthash: bytes32)</text>
+<text text-anchor="start" x="852.87" y="-626.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_apporderoperation: AppOrderOperation): bytes32</text>
+<text text-anchor="start" x="852.87" y="-609.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_datasetorderoperation: DatasetOrderOperation): bytes32</text>
+<text text-anchor="start" x="852.87" y="-593.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_workerpoolorderoperation: WorkerpoolOrderOperation): bytes32</text>
+<text text-anchor="start" x="852.87" y="-576.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_requestorderoperation: RequestOrderOperation): bytes32</text>
 </g>
 <!-- 15&#45;&gt;50 -->
 <g id="edge3" class="edge">
 <title>15&#45;&gt;50</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1466.36,-115.25C1136.09,-132.91 803.18,-164.57 751.6,-221 705.03,-271.94 712.56,-474.67 751.6,-531.6 840.05,-660.59 1008.25,-720.48 1147.6,-748.27"/>
-<polygon fill="black" stroke="black" points="1147.1,-751.74 1157.59,-750.21 1148.44,-744.87 1147.1,-751.74"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1629.4,-115.25C1299.13,-132.91 966.22,-164.57 914.64,-221 868.07,-271.94 895.95,-465.16 914.64,-531.6 917.15,-540.51 920.08,-549.42 923.38,-558.28"/>
+<polygon fill="black" stroke="black" points="920.21,-559.81 927.08,-567.87 926.74,-557.28 920.21,-559.81"/>
 </g>
 <!-- 53 -->
 <g id="node15" class="node">
 <title>53</title>
-<polygon fill="#f2f2f2" stroke="black" points="1560.99,-1597.7 1560.99,-1815.3 1784.21,-1815.3 1784.21,-1597.7 1560.99,-1597.7"/>
-<text text-anchor="middle" x="1672.6" y="-1798.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="1672.6" y="-1781.9" font-family="Times,serif" font-size="14.00">AppOrder</text>
-<text text-anchor="middle" x="1672.6" y="-1765.1" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="1560.99,-1756.9 1784.21,-1756.9 "/>
-<text text-anchor="start" x="1568.99" y="-1740.3" font-family="Times,serif" font-size="14.00">app: address</text>
-<text text-anchor="start" x="1568.99" y="-1723.5" font-family="Times,serif" font-size="14.00">appprice: uint256</text>
-<text text-anchor="start" x="1568.99" y="-1706.7" font-family="Times,serif" font-size="14.00">volume: uint256</text>
-<text text-anchor="start" x="1568.99" y="-1689.9" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
-<text text-anchor="start" x="1568.99" y="-1673.1" font-family="Times,serif" font-size="14.00">datasetrestrict: address</text>
-<text text-anchor="start" x="1568.99" y="-1656.3" font-family="Times,serif" font-size="14.00">workerpoolrestrict: address</text>
-<text text-anchor="start" x="1568.99" y="-1639.5" font-family="Times,serif" font-size="14.00">requesterrestrict: address</text>
-<text text-anchor="start" x="1568.99" y="-1622.7" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
-<text text-anchor="start" x="1568.99" y="-1605.9" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+<polygon fill="#f2f2f2" stroke="black" points="39.03,-1505.3 39.03,-1722.9 262.25,-1722.9 262.25,-1505.3 39.03,-1505.3"/>
+<text text-anchor="middle" x="150.64" y="-1706.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="150.64" y="-1689.5" font-family="Times,serif" font-size="14.00">AppOrder</text>
+<text text-anchor="middle" x="150.64" y="-1672.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="39.03,-1664.5 262.25,-1664.5 "/>
+<text text-anchor="start" x="47.03" y="-1647.9" font-family="Times,serif" font-size="14.00">app: address</text>
+<text text-anchor="start" x="47.03" y="-1631.1" font-family="Times,serif" font-size="14.00">appprice: uint256</text>
+<text text-anchor="start" x="47.03" y="-1614.3" font-family="Times,serif" font-size="14.00">volume: uint256</text>
+<text text-anchor="start" x="47.03" y="-1597.5" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
+<text text-anchor="start" x="47.03" y="-1580.7" font-family="Times,serif" font-size="14.00">datasetrestrict: address</text>
+<text text-anchor="start" x="47.03" y="-1563.9" font-family="Times,serif" font-size="14.00">workerpoolrestrict: address</text>
+<text text-anchor="start" x="47.03" y="-1547.1" font-family="Times,serif" font-size="14.00">requesterrestrict: address</text>
+<text text-anchor="start" x="47.03" y="-1530.3" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
+<text text-anchor="start" x="47.03" y="-1513.5" font-family="Times,serif" font-size="14.00">sign: bytes</text>
 </g>
 <!-- 15&#45;&gt;53 -->
 <g id="edge4" class="edge">
 <title>15&#45;&gt;53</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2169.05,-184.58C2166.44,-480.93 2151.26,-1404.28 2063.6,-1502.4 2010.4,-1561.94 1960.13,-1505.03 1887.6,-1538.4 1854.52,-1553.62 1821.89,-1574.8 1792.43,-1596.98"/>
-<polygon fill="black" stroke="black" points="1790.03,-1594.41 1784.21,-1603.26 1794.28,-1599.98 1790.03,-1594.41"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1629.41,-117.44C1290.02,-135.82 943.51,-167.48 885.64,-221 782.88,-316.04 938.05,-438.39 833.64,-531.6 720.09,-632.96 260.03,-462.81 149.64,-567.6 -103.47,-807.86 24.17,-1276.96 103.42,-1495.64"/>
+<polygon fill="black" stroke="black" points="100.2,-1497.03 106.92,-1505.22 106.78,-1494.63 100.2,-1497.03"/>
 </g>
 <!-- 54 -->
 <g id="node16" class="node">
 <title>54</title>
-<polygon fill="#f2f2f2" stroke="black" points="1896.99,-1597.7 1896.99,-1815.3 2120.21,-1815.3 2120.21,-1597.7 1896.99,-1597.7"/>
-<text text-anchor="middle" x="2008.6" y="-1798.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="2008.6" y="-1781.9" font-family="Times,serif" font-size="14.00">DatasetOrder</text>
-<text text-anchor="middle" x="2008.6" y="-1765.1" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="1896.99,-1756.9 2120.21,-1756.9 "/>
-<text text-anchor="start" x="1904.99" y="-1740.3" font-family="Times,serif" font-size="14.00">dataset: address</text>
-<text text-anchor="start" x="1904.99" y="-1723.5" font-family="Times,serif" font-size="14.00">datasetprice: uint256</text>
-<text text-anchor="start" x="1904.99" y="-1706.7" font-family="Times,serif" font-size="14.00">volume: uint256</text>
-<text text-anchor="start" x="1904.99" y="-1689.9" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
-<text text-anchor="start" x="1904.99" y="-1673.1" font-family="Times,serif" font-size="14.00">apprestrict: address</text>
-<text text-anchor="start" x="1904.99" y="-1656.3" font-family="Times,serif" font-size="14.00">workerpoolrestrict: address</text>
-<text text-anchor="start" x="1904.99" y="-1639.5" font-family="Times,serif" font-size="14.00">requesterrestrict: address</text>
-<text text-anchor="start" x="1904.99" y="-1622.7" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
-<text text-anchor="start" x="1904.99" y="-1605.9" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+<polygon fill="#f2f2f2" stroke="black" points="1231.03,-1505.3 1231.03,-1722.9 1454.25,-1722.9 1454.25,-1505.3 1231.03,-1505.3"/>
+<text text-anchor="middle" x="1342.64" y="-1706.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="1342.64" y="-1689.5" font-family="Times,serif" font-size="14.00">DatasetOrder</text>
+<text text-anchor="middle" x="1342.64" y="-1672.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="1231.03,-1664.5 1454.25,-1664.5 "/>
+<text text-anchor="start" x="1239.03" y="-1647.9" font-family="Times,serif" font-size="14.00">dataset: address</text>
+<text text-anchor="start" x="1239.03" y="-1631.1" font-family="Times,serif" font-size="14.00">datasetprice: uint256</text>
+<text text-anchor="start" x="1239.03" y="-1614.3" font-family="Times,serif" font-size="14.00">volume: uint256</text>
+<text text-anchor="start" x="1239.03" y="-1597.5" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
+<text text-anchor="start" x="1239.03" y="-1580.7" font-family="Times,serif" font-size="14.00">apprestrict: address</text>
+<text text-anchor="start" x="1239.03" y="-1563.9" font-family="Times,serif" font-size="14.00">workerpoolrestrict: address</text>
+<text text-anchor="start" x="1239.03" y="-1547.1" font-family="Times,serif" font-size="14.00">requesterrestrict: address</text>
+<text text-anchor="start" x="1239.03" y="-1530.3" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
+<text text-anchor="start" x="1239.03" y="-1513.5" font-family="Times,serif" font-size="14.00">sign: bytes</text>
 </g>
 <!-- 15&#45;&gt;54 -->
 <g id="edge5" class="edge">
 <title>15&#45;&gt;54</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2180.83,-184.64C2181.97,-196.85 2182.95,-209.22 2183.6,-221 2191.14,-358.84 2188.49,-393.64 2183.6,-531.6 2168.25,-963.88 2232.47,-1086.21 2114.6,-1502.4 2106.39,-1531.37 2093.77,-1560.96 2080.07,-1588.28"/>
-<polygon fill="black" stroke="black" points="2076.81,-1586.95 2075.38,-1597.45 2083.05,-1590.14 2076.81,-1586.95"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1629.35,-117.17C1312.2,-135.28 997.12,-166.76 947.64,-221 924.38,-246.5 924.56,-505.94 947.64,-531.6 998.46,-588.08 1227.01,-521.81 1287.64,-567.6 1458.67,-696.78 1426.9,-804.57 1467.64,-1015 1494.62,-1154.37 1497.34,-1195.59 1467.64,-1334.4 1455.78,-1389.81 1432.04,-1447.53 1408.41,-1495.97"/>
+<polygon fill="black" stroke="black" points="1405.13,-1494.7 1403.84,-1505.21 1411.41,-1497.8 1405.13,-1494.7"/>
 </g>
 <!-- 55 -->
 <g id="node17" class="node">
 <title>55</title>
-<polygon fill="#f2f2f2" stroke="black" points="1262.99,-1580.9 1262.99,-1832.1 1486.21,-1832.1 1486.21,-1580.9 1262.99,-1580.9"/>
-<text text-anchor="middle" x="1374.6" y="-1815.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="1374.6" y="-1798.7" font-family="Times,serif" font-size="14.00">WorkerpoolOrder</text>
-<text text-anchor="middle" x="1374.6" y="-1781.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="1262.99,-1773.7 1486.21,-1773.7 "/>
-<text text-anchor="start" x="1270.99" y="-1757.1" font-family="Times,serif" font-size="14.00">workerpool: address</text>
-<text text-anchor="start" x="1270.99" y="-1740.3" font-family="Times,serif" font-size="14.00">workerpoolprice: uint256</text>
-<text text-anchor="start" x="1270.99" y="-1723.5" font-family="Times,serif" font-size="14.00">volume: uint256</text>
-<text text-anchor="start" x="1270.99" y="-1706.7" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
-<text text-anchor="start" x="1270.99" y="-1689.9" font-family="Times,serif" font-size="14.00">category: uint256</text>
-<text text-anchor="start" x="1270.99" y="-1673.1" font-family="Times,serif" font-size="14.00">trust: uint256</text>
-<text text-anchor="start" x="1270.99" y="-1656.3" font-family="Times,serif" font-size="14.00">apprestrict: address</text>
-<text text-anchor="start" x="1270.99" y="-1639.5" font-family="Times,serif" font-size="14.00">datasetrestrict: address</text>
-<text text-anchor="start" x="1270.99" y="-1622.7" font-family="Times,serif" font-size="14.00">requesterrestrict: address</text>
-<text text-anchor="start" x="1270.99" y="-1605.9" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
-<text text-anchor="start" x="1270.99" y="-1589.1" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+<polygon fill="#f2f2f2" stroke="black" points="1713.03,-1488.5 1713.03,-1739.7 1936.25,-1739.7 1936.25,-1488.5 1713.03,-1488.5"/>
+<text text-anchor="middle" x="1824.64" y="-1723.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="1824.64" y="-1706.3" font-family="Times,serif" font-size="14.00">WorkerpoolOrder</text>
+<text text-anchor="middle" x="1824.64" y="-1689.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="1713.03,-1681.3 1936.25,-1681.3 "/>
+<text text-anchor="start" x="1721.03" y="-1664.7" font-family="Times,serif" font-size="14.00">workerpool: address</text>
+<text text-anchor="start" x="1721.03" y="-1647.9" font-family="Times,serif" font-size="14.00">workerpoolprice: uint256</text>
+<text text-anchor="start" x="1721.03" y="-1631.1" font-family="Times,serif" font-size="14.00">volume: uint256</text>
+<text text-anchor="start" x="1721.03" y="-1614.3" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
+<text text-anchor="start" x="1721.03" y="-1597.5" font-family="Times,serif" font-size="14.00">category: uint256</text>
+<text text-anchor="start" x="1721.03" y="-1580.7" font-family="Times,serif" font-size="14.00">trust: uint256</text>
+<text text-anchor="start" x="1721.03" y="-1563.9" font-family="Times,serif" font-size="14.00">apprestrict: address</text>
+<text text-anchor="start" x="1721.03" y="-1547.1" font-family="Times,serif" font-size="14.00">datasetrestrict: address</text>
+<text text-anchor="start" x="1721.03" y="-1530.3" font-family="Times,serif" font-size="14.00">requesterrestrict: address</text>
+<text text-anchor="start" x="1721.03" y="-1513.5" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
+<text text-anchor="start" x="1721.03" y="-1496.7" font-family="Times,serif" font-size="14.00">sign: bytes</text>
 </g>
 <!-- 15&#45;&gt;55 -->
 <g id="edge6" class="edge">
 <title>15&#45;&gt;55</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1466.3,-117.17C1149.16,-135.28 834.08,-166.76 784.6,-221 761.34,-246.5 760.74,-506.66 784.6,-531.6 847.34,-597.17 1524.55,-518.07 1600.6,-567.6 1771.61,-678.98 1646.26,-850.22 1804.6,-979 1853.77,-1019 1903.84,-964.84 1942.6,-1015 1975.71,-1057.86 1979.09,-1462.39 1942.6,-1502.4 1883.79,-1566.87 1631.12,-1502.48 1551.6,-1538.4 1531.22,-1547.6 1511.71,-1560.14 1493.58,-1574.23"/>
-<polygon fill="black" stroke="black" points="1490.97,-1571.83 1485.34,-1580.81 1495.34,-1577.3 1490.97,-1571.83"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2368.88,-184.53C2401.57,-283.43 2432.6,-439.56 2346.64,-531.6 2266.51,-617.38 1899.76,-481.82 1819.64,-567.6 1758.97,-632.55 1794.06,-1210.07 1813.9,-1477.85"/>
+<polygon fill="black" stroke="black" points="1810.42,-1478.31 1814.65,-1488.03 1817.4,-1477.79 1810.42,-1478.31"/>
 </g>
 <!-- 56 -->
 <g id="node18" class="node">
 <title>56</title>
-<polygon fill="#f2f2f2" stroke="black" points="443.99,-1538.9 443.99,-1874.1 667.21,-1874.1 667.21,-1538.9 443.99,-1538.9"/>
-<text text-anchor="middle" x="555.6" y="-1857.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="555.6" y="-1840.7" font-family="Times,serif" font-size="14.00">RequestOrder</text>
-<text text-anchor="middle" x="555.6" y="-1823.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="443.99,-1815.7 667.21,-1815.7 "/>
-<text text-anchor="start" x="451.99" y="-1799.1" font-family="Times,serif" font-size="14.00">app: address</text>
-<text text-anchor="start" x="451.99" y="-1782.3" font-family="Times,serif" font-size="14.00">appmaxprice: uint256</text>
-<text text-anchor="start" x="451.99" y="-1765.5" font-family="Times,serif" font-size="14.00">dataset: address</text>
-<text text-anchor="start" x="451.99" y="-1748.7" font-family="Times,serif" font-size="14.00">datasetmaxprice: uint256</text>
-<text text-anchor="start" x="451.99" y="-1731.9" font-family="Times,serif" font-size="14.00">workerpool: address</text>
-<text text-anchor="start" x="451.99" y="-1715.1" font-family="Times,serif" font-size="14.00">workerpoolmaxprice: uint256</text>
-<text text-anchor="start" x="451.99" y="-1698.3" font-family="Times,serif" font-size="14.00">requester: address</text>
-<text text-anchor="start" x="451.99" y="-1681.5" font-family="Times,serif" font-size="14.00">volume: uint256</text>
-<text text-anchor="start" x="451.99" y="-1664.7" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
-<text text-anchor="start" x="451.99" y="-1647.9" font-family="Times,serif" font-size="14.00">category: uint256</text>
-<text text-anchor="start" x="451.99" y="-1631.1" font-family="Times,serif" font-size="14.00">trust: uint256</text>
-<text text-anchor="start" x="451.99" y="-1614.3" font-family="Times,serif" font-size="14.00">beneficiary: address</text>
-<text text-anchor="start" x="451.99" y="-1597.5" font-family="Times,serif" font-size="14.00">callback: address</text>
-<text text-anchor="start" x="451.99" y="-1580.7" font-family="Times,serif" font-size="14.00">params: string</text>
-<text text-anchor="start" x="451.99" y="-1563.9" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
-<text text-anchor="start" x="451.99" y="-1547.1" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+<polygon fill="#f2f2f2" stroke="black" points="1472.03,-1446.5 1472.03,-1781.7 1695.25,-1781.7 1695.25,-1446.5 1472.03,-1446.5"/>
+<text text-anchor="middle" x="1583.64" y="-1765.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="1583.64" y="-1748.3" font-family="Times,serif" font-size="14.00">RequestOrder</text>
+<text text-anchor="middle" x="1583.64" y="-1731.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="1472.03,-1723.3 1695.25,-1723.3 "/>
+<text text-anchor="start" x="1480.03" y="-1706.7" font-family="Times,serif" font-size="14.00">app: address</text>
+<text text-anchor="start" x="1480.03" y="-1689.9" font-family="Times,serif" font-size="14.00">appmaxprice: uint256</text>
+<text text-anchor="start" x="1480.03" y="-1673.1" font-family="Times,serif" font-size="14.00">dataset: address</text>
+<text text-anchor="start" x="1480.03" y="-1656.3" font-family="Times,serif" font-size="14.00">datasetmaxprice: uint256</text>
+<text text-anchor="start" x="1480.03" y="-1639.5" font-family="Times,serif" font-size="14.00">workerpool: address</text>
+<text text-anchor="start" x="1480.03" y="-1622.7" font-family="Times,serif" font-size="14.00">workerpoolmaxprice: uint256</text>
+<text text-anchor="start" x="1480.03" y="-1605.9" font-family="Times,serif" font-size="14.00">requester: address</text>
+<text text-anchor="start" x="1480.03" y="-1589.1" font-family="Times,serif" font-size="14.00">volume: uint256</text>
+<text text-anchor="start" x="1480.03" y="-1572.3" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
+<text text-anchor="start" x="1480.03" y="-1555.5" font-family="Times,serif" font-size="14.00">category: uint256</text>
+<text text-anchor="start" x="1480.03" y="-1538.7" font-family="Times,serif" font-size="14.00">trust: uint256</text>
+<text text-anchor="start" x="1480.03" y="-1521.9" font-family="Times,serif" font-size="14.00">beneficiary: address</text>
+<text text-anchor="start" x="1480.03" y="-1505.1" font-family="Times,serif" font-size="14.00">callback: address</text>
+<text text-anchor="start" x="1480.03" y="-1488.3" font-family="Times,serif" font-size="14.00">params: string</text>
+<text text-anchor="start" x="1480.03" y="-1471.5" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
+<text text-anchor="start" x="1480.03" y="-1454.7" font-family="Times,serif" font-size="14.00">sign: bytes</text>
 </g>
 <!-- 15&#45;&gt;56 -->
 <g id="edge7" class="edge">
 <title>15&#45;&gt;56</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1466.35,-116.54C1123.95,-134.68 773.38,-166.39 715.6,-221 614.22,-316.81 762.16,-426.37 670.6,-531.6 632.93,-574.89 583.36,-523.54 546.6,-567.6 280.1,-886.99 445.75,-1090.06 500.6,-1502.4 501.75,-1511.08 503.17,-1519.92 504.8,-1528.81"/>
-<polygon fill="black" stroke="black" points="501.41,-1529.69 506.72,-1538.86 508.28,-1528.38 501.41,-1529.69"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2335.03,-184.74C2337.24,-305.87 2337.25,-507.41 2313.64,-531.6 2231.03,-616.24 1871.15,-489.15 1782.64,-567.6 1718.18,-624.73 1642.04,-1153.38 1605.43,-1436.29"/>
+<polygon fill="black" stroke="black" points="1601.96,-1435.89 1604.15,-1446.25 1608.9,-1436.78 1601.96,-1435.89"/>
 </g>
 <!-- 61 -->
 <g id="node23" class="node">
 <title>61</title>
-<polygon fill="#f2f2f2" stroke="black" points="4036.15,-702.5 4036.15,-844.1 4301.04,-844.1 4301.04,-702.5 4036.15,-702.5"/>
-<text text-anchor="middle" x="4168.6" y="-827.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
-<text text-anchor="middle" x="4168.6" y="-810.7" font-family="Times,serif" font-size="14.00">PocoStorageLib</text>
-<text text-anchor="middle" x="4168.6" y="-793.9" font-family="Times,serif" font-size="14.00">contracts/libs/PocoStorageLib.sol</text>
-<polyline fill="none" stroke="black" points="4036.15,-785.7 4301.04,-785.7 "/>
-<text text-anchor="start" x="4044.15" y="-769.1" font-family="Times,serif" font-size="14.00">Private:</text>
-<text text-anchor="start" x="4044.15" y="-752.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;POCO_STORAGE_LOCATION: bytes32</text>
-<polyline fill="none" stroke="black" points="4036.15,-744.1 4301.04,-744.1 "/>
-<text text-anchor="start" x="4044.15" y="-727.5" font-family="Times,serif" font-size="14.00">Internal:</text>
-<text text-anchor="start" x="4044.15" y="-710.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;getPocoStorage(): ($: PocoStorage)</text>
+<polygon fill="#f2f2f2" stroke="black" points="3741.19,-1103.9 3741.19,-1245.5 4006.08,-1245.5 4006.08,-1103.9 3741.19,-1103.9"/>
+<text text-anchor="middle" x="3873.64" y="-1228.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
+<text text-anchor="middle" x="3873.64" y="-1212.1" font-family="Times,serif" font-size="14.00">PocoStorageLib</text>
+<text text-anchor="middle" x="3873.64" y="-1195.3" font-family="Times,serif" font-size="14.00">contracts/libs/PocoStorageLib.sol</text>
+<polyline fill="none" stroke="black" points="3741.19,-1187.1 4006.08,-1187.1 "/>
+<text text-anchor="start" x="3749.19" y="-1170.5" font-family="Times,serif" font-size="14.00">Private:</text>
+<text text-anchor="start" x="3749.19" y="-1153.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;POCO_STORAGE_LOCATION: bytes32</text>
+<polyline fill="none" stroke="black" points="3741.19,-1145.5 4006.08,-1145.5 "/>
+<text text-anchor="start" x="3749.19" y="-1128.9" font-family="Times,serif" font-size="14.00">Internal:</text>
+<text text-anchor="start" x="3749.19" y="-1112.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;getPocoStorage(): ($: PocoStorage)</text>
 </g>
 <!-- 15&#45;&gt;61 -->
 <g id="edge8" class="edge">
 <title>15&#45;&gt;61</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2872.8,-117.13C3420.38,-138.99 4095.24,-175.01 4140.6,-221 4172.88,-253.73 4172.5,-547.16 4170.28,-692.06"/>
-<polygon fill="black" stroke="black" points="4166.78,-692.18 4170.12,-702.23 4173.78,-692.29 4166.78,-692.18"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3035.97,-170.46C3294.2,-235.27 3564.48,-353.34 3733.64,-567.6 3790.53,-639.66 3745.62,-890.95 3771.64,-979 3783.45,-1018.98 3803.76,-1060.29 3823.15,-1094.51"/>
+<polygon fill="black" stroke="black" points="3820.31,-1096.59 3828.33,-1103.52 3826.38,-1093.1 3820.31,-1096.59"/>
 </g>
 <!-- 62 -->
 <g id="node24" class="node">
 <title>62</title>
-<polygon fill="#f2f2f2" stroke="black" points="3907.63,-1015.5 3907.63,-1501.9 4429.56,-1501.9 4429.56,-1015.5 3907.63,-1015.5"/>
-<text text-anchor="middle" x="4168.6" y="-1485.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="4168.6" y="-1468.5" font-family="Times,serif" font-size="14.00">PocoStorage</text>
-<text text-anchor="middle" x="4168.6" y="-1451.7" font-family="Times,serif" font-size="14.00">contracts/libs/PocoStorageLib.sol</text>
-<polyline fill="none" stroke="black" points="3907.63,-1443.5 4429.56,-1443.5 "/>
-<text text-anchor="start" x="3915.63" y="-1426.9" font-family="Times,serif" font-size="14.00">m_appregistry: IRegistry</text>
-<text text-anchor="start" x="3915.63" y="-1410.1" font-family="Times,serif" font-size="14.00">m_datasetregistry: IRegistry</text>
-<text text-anchor="start" x="3915.63" y="-1393.3" font-family="Times,serif" font-size="14.00">m_workerpoolregistry: IRegistry</text>
-<text text-anchor="start" x="3915.63" y="-1376.5" font-family="Times,serif" font-size="14.00">m_baseToken: IERC20</text>
-<text text-anchor="start" x="3915.63" y="-1359.7" font-family="Times,serif" font-size="14.00">m_name: string</text>
-<text text-anchor="start" x="3915.63" y="-1342.9" font-family="Times,serif" font-size="14.00">m_symbol: string</text>
-<text text-anchor="start" x="3915.63" y="-1326.1" font-family="Times,serif" font-size="14.00">m_decimals: uint8</text>
-<text text-anchor="start" x="3915.63" y="-1309.3" font-family="Times,serif" font-size="14.00">m_totalSupply: uint256</text>
-<text text-anchor="start" x="3915.63" y="-1292.5" font-family="Times,serif" font-size="14.00">m_balances: mapping(address=&gt;uint256)</text>
-<text text-anchor="start" x="3915.63" y="-1275.7" font-family="Times,serif" font-size="14.00">m_frozens: mapping(address=&gt;uint256)</text>
-<text text-anchor="start" x="3915.63" y="-1258.9" font-family="Times,serif" font-size="14.00">m_allowances: mapping(address=&gt;mapping(address=&gt;uint256))</text>
-<text text-anchor="start" x="3915.63" y="-1242.1" font-family="Times,serif" font-size="14.00">m_eip712DomainSeparator: bytes32</text>
-<text text-anchor="start" x="3915.63" y="-1225.3" font-family="Times,serif" font-size="14.00">m_presigned: mapping(bytes32=&gt;address)</text>
-<text text-anchor="start" x="3915.63" y="-1208.5" font-family="Times,serif" font-size="14.00">m_consumed: mapping(bytes32=&gt;uint256)</text>
-<text text-anchor="start" x="3915.63" y="-1191.7" font-family="Times,serif" font-size="14.00">m_deals: mapping(bytes32=&gt;IexecLibCore_v5.Deal)</text>
-<text text-anchor="start" x="3915.63" y="-1174.9" font-family="Times,serif" font-size="14.00">m_tasks: mapping(bytes32=&gt;IexecLibCore_v5.Task)</text>
-<text text-anchor="start" x="3915.63" y="-1158.1" font-family="Times,serif" font-size="14.00">m_consensus: mapping(bytes32=&gt;IexecLibCore_v5.Consensus)</text>
-<text text-anchor="start" x="3915.63" y="-1141.3" font-family="Times,serif" font-size="14.00">m_contributions: mapping(bytes32=&gt;mapping(address=&gt;IexecLibCore_v5.Contribution))</text>
-<text text-anchor="start" x="3915.63" y="-1124.5" font-family="Times,serif" font-size="14.00">m_workerScores: mapping(address=&gt;uint256)</text>
-<text text-anchor="start" x="3915.63" y="-1107.7" font-family="Times,serif" font-size="14.00">m_teebroker: address</text>
-<text text-anchor="start" x="3915.63" y="-1090.9" font-family="Times,serif" font-size="14.00">m_callbackgas: uint256</text>
-<text text-anchor="start" x="3915.63" y="-1074.1" font-family="Times,serif" font-size="14.00">m_categories: IexecLibCore_v5.Category[]</text>
-<text text-anchor="start" x="3915.63" y="-1057.3" font-family="Times,serif" font-size="14.00">m_v3_iexecHub: IexecHubV3Interface</text>
-<text text-anchor="start" x="3915.63" y="-1040.5" font-family="Times,serif" font-size="14.00">m_v3_scoreImported: mapping(address=&gt;bool)</text>
-<text text-anchor="start" x="3915.63" y="-1023.7" font-family="Times,serif" font-size="14.00">m_dealsBoost: mapping(bytes32=&gt;IexecLibCore_v5.DealBoost)</text>
+<polygon fill="#f2f2f2" stroke="black" points="3727.67,-1370.9 3727.67,-1857.3 4249.61,-1857.3 4249.61,-1370.9 3727.67,-1370.9"/>
+<text text-anchor="middle" x="3988.64" y="-1840.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="3988.64" y="-1823.9" font-family="Times,serif" font-size="14.00">PocoStorage</text>
+<text text-anchor="middle" x="3988.64" y="-1807.1" font-family="Times,serif" font-size="14.00">contracts/libs/PocoStorageLib.sol</text>
+<polyline fill="none" stroke="black" points="3727.67,-1798.9 4249.61,-1798.9 "/>
+<text text-anchor="start" x="3735.67" y="-1782.3" font-family="Times,serif" font-size="14.00">m_appregistry: IRegistry</text>
+<text text-anchor="start" x="3735.67" y="-1765.5" font-family="Times,serif" font-size="14.00">m_datasetregistry: IRegistry</text>
+<text text-anchor="start" x="3735.67" y="-1748.7" font-family="Times,serif" font-size="14.00">m_workerpoolregistry: IRegistry</text>
+<text text-anchor="start" x="3735.67" y="-1731.9" font-family="Times,serif" font-size="14.00">m_baseToken: IERC20</text>
+<text text-anchor="start" x="3735.67" y="-1715.1" font-family="Times,serif" font-size="14.00">m_name: string</text>
+<text text-anchor="start" x="3735.67" y="-1698.3" font-family="Times,serif" font-size="14.00">m_symbol: string</text>
+<text text-anchor="start" x="3735.67" y="-1681.5" font-family="Times,serif" font-size="14.00">m_decimals: uint8</text>
+<text text-anchor="start" x="3735.67" y="-1664.7" font-family="Times,serif" font-size="14.00">m_totalSupply: uint256</text>
+<text text-anchor="start" x="3735.67" y="-1647.9" font-family="Times,serif" font-size="14.00">m_balances: mapping(address=&gt;uint256)</text>
+<text text-anchor="start" x="3735.67" y="-1631.1" font-family="Times,serif" font-size="14.00">m_frozens: mapping(address=&gt;uint256)</text>
+<text text-anchor="start" x="3735.67" y="-1614.3" font-family="Times,serif" font-size="14.00">m_allowances: mapping(address=&gt;mapping(address=&gt;uint256))</text>
+<text text-anchor="start" x="3735.67" y="-1597.5" font-family="Times,serif" font-size="14.00">m_eip712DomainSeparator: bytes32</text>
+<text text-anchor="start" x="3735.67" y="-1580.7" font-family="Times,serif" font-size="14.00">m_presigned: mapping(bytes32=&gt;address)</text>
+<text text-anchor="start" x="3735.67" y="-1563.9" font-family="Times,serif" font-size="14.00">m_consumed: mapping(bytes32=&gt;uint256)</text>
+<text text-anchor="start" x="3735.67" y="-1547.1" font-family="Times,serif" font-size="14.00">m_deals: mapping(bytes32=&gt;IexecLibCore_v5.Deal)</text>
+<text text-anchor="start" x="3735.67" y="-1530.3" font-family="Times,serif" font-size="14.00">m_tasks: mapping(bytes32=&gt;IexecLibCore_v5.Task)</text>
+<text text-anchor="start" x="3735.67" y="-1513.5" font-family="Times,serif" font-size="14.00">m_consensus: mapping(bytes32=&gt;IexecLibCore_v5.Consensus)</text>
+<text text-anchor="start" x="3735.67" y="-1496.7" font-family="Times,serif" font-size="14.00">m_contributions: mapping(bytes32=&gt;mapping(address=&gt;IexecLibCore_v5.Contribution))</text>
+<text text-anchor="start" x="3735.67" y="-1479.9" font-family="Times,serif" font-size="14.00">m_workerScores: mapping(address=&gt;uint256)</text>
+<text text-anchor="start" x="3735.67" y="-1463.1" font-family="Times,serif" font-size="14.00">m_teebroker: address</text>
+<text text-anchor="start" x="3735.67" y="-1446.3" font-family="Times,serif" font-size="14.00">m_callbackgas: uint256</text>
+<text text-anchor="start" x="3735.67" y="-1429.5" font-family="Times,serif" font-size="14.00">m_categories: IexecLibCore_v5.Category[]</text>
+<text text-anchor="start" x="3735.67" y="-1412.7" font-family="Times,serif" font-size="14.00">m_v3_iexecHub: IexecHubV3Interface</text>
+<text text-anchor="start" x="3735.67" y="-1395.9" font-family="Times,serif" font-size="14.00">m_v3_scoreImported: mapping(address=&gt;bool)</text>
+<text text-anchor="start" x="3735.67" y="-1379.1" font-family="Times,serif" font-size="14.00">m_dealsBoost: mapping(bytes32=&gt;IexecLibCore_v5.DealBoost)</text>
 </g>
 <!-- 15&#45;&gt;62 -->
 <g id="edge9" class="edge">
 <title>15&#45;&gt;62</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2872.88,-106.93C3570.15,-123.78 4543.18,-158.39 4602.6,-221 4650.11,-271.07 4619.65,-464.72 4602.6,-531.6 4546.64,-751.07 4476.75,-785.77 4358.6,-979 4352.98,-988.18 4347.2,-997.48 4341.29,-1006.83"/>
-<polygon fill="black" stroke="black" points="4338.24,-1005.11 4335.84,-1015.43 4344.15,-1008.86 4338.24,-1005.11"/>
-</g>
-<!-- 78 -->
-<g id="node26" class="node">
-<title>78</title>
-<polygon fill="#f2f2f2" stroke="black" points="4994.02,-301.1 4994.02,-451.5 5303.17,-451.5 5303.17,-301.1 4994.02,-301.1"/>
-<text text-anchor="middle" x="5148.6" y="-434.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
-<text text-anchor="middle" x="5148.6" y="-418.1" font-family="Times,serif" font-size="14.00">IWorkerpool</text>
-<text text-anchor="middle" x="5148.6" y="-401.3" font-family="Times,serif" font-size="14.00">contracts/registries/workerpools/IWorkerpool.v8.sol</text>
-<polyline fill="none" stroke="black" points="4994.02,-393.1 5303.17,-393.1 "/>
-<text text-anchor="start" x="5002.02" y="-376.5" font-family="Times,serif" font-size="14.00">External:</text>
-<text text-anchor="start" x="5002.02" y="-359.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;owner(): address</text>
-<text text-anchor="start" x="5002.02" y="-342.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;m_workerpoolDescription(): string</text>
-<text text-anchor="start" x="5002.02" y="-326.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;m_schedulerRewardRatioPolicy(): uint256</text>
-<text text-anchor="start" x="5002.02" y="-309.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;m_workerStakeRatioPolicy(): uint256</text>
-</g>
-<!-- 15&#45;&gt;78 -->
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3035.79,-99.71C3534.95,-111.02 4131.71,-141.32 4220.64,-221 4404.93,-386.12 4311.41,-1110.24 4206.64,-1334.4 4202.4,-1343.48 4197.81,-1352.53 4192.94,-1361.52"/>
+<polygon fill="black" stroke="black" points="4189.75,-1360.05 4187.97,-1370.5 4195.88,-1363.44 4189.75,-1360.05"/>
+</g>
+<!-- 79 -->
+<g id="node27" class="node">
+<title>79</title>
+<polygon fill="#f2f2f2" stroke="black" points="4495.07,-301.1 4495.07,-451.5 4804.21,-451.5 4804.21,-301.1 4495.07,-301.1"/>
+<text text-anchor="middle" x="4649.64" y="-434.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
+<text text-anchor="middle" x="4649.64" y="-418.1" font-family="Times,serif" font-size="14.00">IWorkerpool</text>
+<text text-anchor="middle" x="4649.64" y="-401.3" font-family="Times,serif" font-size="14.00">contracts/registries/workerpools/IWorkerpool.v8.sol</text>
+<polyline fill="none" stroke="black" points="4495.07,-393.1 4804.21,-393.1 "/>
+<text text-anchor="start" x="4503.07" y="-376.5" font-family="Times,serif" font-size="14.00">External:</text>
+<text text-anchor="start" x="4503.07" y="-359.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;owner(): address</text>
+<text text-anchor="start" x="4503.07" y="-342.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;m_workerpoolDescription(): string</text>
+<text text-anchor="start" x="4503.07" y="-326.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;m_schedulerRewardRatioPolicy(): uint256</text>
+<text text-anchor="start" x="4503.07" y="-309.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;m_workerStakeRatioPolicy(): uint256</text>
+</g>
+<!-- 15&#45;&gt;79 -->
 <g id="edge13" class="edge">
-<title>15&#45;&gt;78</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2872.84,-100.56C3641.72,-112.2 4790.31,-142.61 4979.6,-221 5017.83,-236.84 5052.94,-265.33 5081.12,-293.57"/>
-<polygon fill="black" stroke="black" points="5078.64,-296.03 5088.14,-300.73 5083.64,-291.14 5078.64,-296.03"/>
+<title>15&#45;&gt;79</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3035.95,-111.94C3610.79,-130.88 4349.3,-165.53 4480.64,-221 4518.76,-237.1 4553.85,-265.65 4582.05,-293.85"/>
+<polygon fill="black" stroke="black" points="4579.56,-296.31 4589.07,-301 4584.56,-291.41 4579.56,-296.31"/>
 </g>
 <!-- 24 -->
 <g id="node4" class="node">
 <title>24</title>
-<polygon fill="#f2f2f2" stroke="black" points="3899.69,-1656.5 3899.69,-1756.5 4169.5,-1756.5 4169.5,-1656.5 3899.69,-1656.5"/>
-<text text-anchor="middle" x="4034.6" y="-1739.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
-<text text-anchor="middle" x="4034.6" y="-1723.1" font-family="Times,serif" font-size="14.00">IexecHubV3Interface</text>
-<text text-anchor="middle" x="4034.6" y="-1706.3" font-family="Times,serif" font-size="14.00">contracts/interfaces/IexecHubV3Interface.sol</text>
-<polyline fill="none" stroke="black" points="3899.69,-1698.1 4169.5,-1698.1 "/>
-<text text-anchor="start" x="3907.69" y="-1681.5" font-family="Times,serif" font-size="14.00">External:</text>
-<text text-anchor="start" x="3907.69" y="-1664.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;viewScore(worker: address): uint256</text>
+<polygon fill="#f2f2f2" stroke="black" points="3831.73,-1894.3 3831.73,-1994.3 4101.54,-1994.3 4101.54,-1894.3 3831.73,-1894.3"/>
+<text text-anchor="middle" x="3966.64" y="-1977.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
+<text text-anchor="middle" x="3966.64" y="-1960.9" font-family="Times,serif" font-size="14.00">IexecHubV3Interface</text>
+<text text-anchor="middle" x="3966.64" y="-1944.1" font-family="Times,serif" font-size="14.00">contracts/interfaces/IexecHubV3Interface.sol</text>
+<polyline fill="none" stroke="black" points="3831.73,-1935.9 4101.54,-1935.9 "/>
+<text text-anchor="start" x="3839.73" y="-1919.3" font-family="Times,serif" font-size="14.00">External:</text>
+<text text-anchor="start" x="3839.73" y="-1902.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;viewScore(worker: address): uint256</text>
 </g>
 <!-- 30&#45;&gt;50 -->
 <g id="edge18" class="edge">
 <title>30&#45;&gt;50</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1438.23,-502.01C1434.02,-519.91 1429.59,-538.75 1425.1,-557.79"/>
-<polygon fill="black" stroke="black" points="1421.64,-557.23 1422.75,-567.77 1428.45,-558.83 1421.64,-557.23"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1450.99,-502.01C1398.95,-538.14 1341.47,-578.04 1287.01,-615.85"/>
+<polygon fill="black" stroke="black" points="1284.87,-613.07 1278.65,-621.65 1288.86,-618.82 1284.87,-613.07"/>
 </g>
 <!-- 30&#45;&gt;53 -->
 <g id="edge19" class="edge">
 <title>30&#45;&gt;53</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1833.55,-501.99C1860.65,-520.95 1885.56,-542.69 1906.6,-567.6 2038.73,-724.03 1991.97,-811.72 2016.6,-1015 2042.65,-1230.05 2147.58,-1329.86 2016.6,-1502.4 1980.61,-1549.81 1940.76,-1511.63 1887.6,-1538.4 1854.89,-1554.87 1822.29,-1576.67 1792.72,-1599.07"/>
-<polygon fill="black" stroke="black" points="1790.27,-1596.54 1784.47,-1605.4 1794.53,-1602.09 1790.27,-1596.54"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1018.73,-501.92C955.95,-521.16 893.89,-542.98 835.64,-567.6 493.47,-712.22 308.7,-689.53 129.64,-1015 85.85,-1094.59 111.68,-1344.49 132.45,-1494.91"/>
+<polygon fill="black" stroke="black" points="129.02,-1495.7 133.87,-1505.12 135.96,-1494.73 129.02,-1495.7"/>
 </g>
 <!-- 30&#45;&gt;54 -->
 <g id="edge20" class="edge">
 <title>30&#45;&gt;54</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1900.23,-501.96C1927.39,-520.84 1952.31,-542.58 1973.6,-567.6 2221.65,-859.25 2114.34,-1361.08 2047.44,-1588"/>
-<polygon fill="black" stroke="black" points="2044.08,-1587.03 2044.58,-1597.61 2050.79,-1589.02 2044.08,-1587.03"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1613.28,-502.15C1610.34,-523.96 1607.35,-546.43 1604.64,-567.6 1582.8,-737.83 1599.86,-1186.59 1512.64,-1334.4 1498.72,-1357.98 1480.34,-1349.51 1462.64,-1370.4 1431.43,-1407.23 1405.94,-1453.58 1386.61,-1495.88"/>
+<polygon fill="black" stroke="black" points="1383.37,-1494.56 1382.46,-1505.12 1389.75,-1497.43 1383.37,-1494.56"/>
 </g>
 <!-- 30&#45;&gt;55 -->
 <g id="edge21" class="edge">
 <title>30&#45;&gt;55</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1732.24,-501.94C1758.81,-521.42 1783.66,-543.29 1804.6,-567.6 1942.4,-727.63 2118.47,-1346.88 1975.6,-1502.4 1911.62,-1572.04 1637.91,-1499.78 1551.6,-1538.4 1531.11,-1547.57 1511.5,-1560.12 1493.29,-1574.27"/>
-<polygon fill="black" stroke="black" points="1490.65,-1571.89 1485.03,-1580.87 1495.02,-1577.36 1490.65,-1571.89"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1650.22,-502.02C1686.88,-735.54 1765.57,-1236.83 1803.43,-1478.02"/>
+<polygon fill="black" stroke="black" points="1800.03,-1478.92 1805.04,-1488.25 1806.95,-1477.83 1800.03,-1478.92"/>
 </g>
 <!-- 30&#45;&gt;56 -->
 <g id="edge22" class="edge">
 <title>30&#45;&gt;56</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1137.84,-502.01C920.71,-603.76 654.33,-770.94 529.6,-1015 485.45,-1101.38 507.46,-1354.23 529.66,-1528.72"/>
-<polygon fill="black" stroke="black" points="526.21,-1529.32 530.95,-1538.79 533.15,-1528.42 526.21,-1529.32"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1625.9,-502.02C1617.5,-722.76 1600,-1182.8 1590.37,-1436.2"/>
+<polygon fill="black" stroke="black" points="1586.87,-1436.12 1589.98,-1446.25 1593.86,-1436.39 1586.87,-1436.12"/>
 </g>
 <!-- 34&#45;&gt;61 -->
 <g id="edge23" class="edge">
 <title>34&#45;&gt;61</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3483.48,-497.56C3663.83,-569.88 3885.09,-658.61 4026.47,-715.3"/>
-<polygon fill="black" stroke="black" points="4025.5,-718.69 4036.08,-719.16 4028.11,-712.19 4025.5,-718.69"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3106.89,-894.54C3315.31,-970.42 3573.96,-1064.59 3731.27,-1121.86"/>
+<polygon fill="black" stroke="black" points="3730.42,-1125.28 3741.01,-1125.41 3732.81,-1118.7 3730.42,-1125.28"/>
 </g>
 <!-- 34&#45;&gt;62 -->
 <g id="edge24" class="edge">
 <title>34&#45;&gt;62</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3318.23,-497.64C3467.27,-630.85 3711.31,-848.97 3899.82,-1017.47"/>
-<polygon fill="black" stroke="black" points="3897.56,-1020.14 3907.34,-1024.19 3902.22,-1014.92 3897.56,-1020.14"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2950.61,-894.7C3151.62,-1033.82 3484.76,-1264.37 3719.31,-1426.71"/>
+<polygon fill="black" stroke="black" points="3717.4,-1429.64 3727.62,-1432.45 3721.38,-1423.88 3717.4,-1429.64"/>
 </g>
 <!-- 35&#45;&gt;61 -->
 <g id="edge25" class="edge">
 <title>35&#45;&gt;61</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4311.08,-518.79C4278.04,-577.57 4240.94,-643.58 4212.89,-693.5"/>
-<polygon fill="black" stroke="black" points="4209.78,-691.88 4207.93,-702.31 4215.88,-695.31 4209.78,-691.88"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3850.95,-502C3834.23,-522.08 3819.69,-544.08 3809.64,-567.6 3734.23,-744.04 3797.77,-974.64 3841.24,-1094.13"/>
+<polygon fill="black" stroke="black" points="3837.99,-1095.42 3844.73,-1103.59 3844.55,-1093 3837.99,-1095.42"/>
 </g>
 <!-- 35&#45;&gt;62 -->
 <g id="edge26" class="edge">
 <title>35&#45;&gt;62</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4384.88,-518.77C4376.76,-642.56 4357.11,-825.99 4309.6,-979 4306.82,-987.94 4303.78,-996.93 4300.52,-1005.94"/>
-<polygon fill="black" stroke="black" points="4297.23,-1004.74 4297.05,-1015.34 4303.8,-1007.17 4297.23,-1004.74"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4210.3,-502.18C4229.24,-521.76 4245.76,-543.58 4257.64,-567.6 4298.15,-649.55 4275.86,-889.41 4257.64,-979 4230.96,-1110.21 4176.16,-1247.94 4122.94,-1361.4"/>
+<polygon fill="black" stroke="black" points="4119.72,-1360.02 4118.62,-1370.56 4126.05,-1363.01 4119.72,-1360.02"/>
+</g>
+<!-- 63 -->
+<g id="node25" class="node">
+<title>63</title>
+<polygon fill="#f2f2f2" stroke="black" points="3818.96,-672.9 3818.96,-873.7 4248.32,-873.7 4248.32,-672.9 3818.96,-672.9"/>
+<text text-anchor="middle" x="4033.64" y="-857.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
+<text text-anchor="middle" x="4033.64" y="-840.3" font-family="Times,serif" font-size="14.00">StakedRlcLib</text>
+<text text-anchor="middle" x="4033.64" y="-823.5" font-family="Times,serif" font-size="14.00">contracts/libs/StakedRlcLib.sol</text>
+<polyline fill="none" stroke="black" points="3818.96,-815.3 4248.32,-815.3 "/>
+<text text-anchor="start" x="3826.96" y="-798.7" font-family="Times,serif" font-size="14.00">Internal:</text>
+<text text-anchor="start" x="3826.96" y="-781.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;transfer(from: address, to: address, value: uint256)</text>
+<text text-anchor="start" x="3826.96" y="-765.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;mint(account: address, amount: uint256)</text>
+<text text-anchor="start" x="3826.96" y="-748.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;burn(account: address, amount: uint256)</text>
+<text text-anchor="start" x="3826.96" y="-731.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;approve(owner: address, spender: address, amount: uint256)</text>
+<text text-anchor="start" x="3826.96" y="-714.7" font-family="Times,serif" font-size="14.00">Public:</text>
+<text text-anchor="start" x="3826.96" y="-697.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Transfer(from: address, to: address, value: uint256)</text>
+<text text-anchor="start" x="3826.96" y="-681.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Approval(owner: address, spender: address, value: uint256)</text>
+</g>
+<!-- 35&#45;&gt;63 -->
+<g id="edge27" class="edge">
+<title>35&#45;&gt;63</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4016.53,-502.01C4019.79,-553.51 4023.54,-612.69 4026.69,-662.52"/>
+<polygon fill="black" stroke="black" points="4023.21,-662.92 4027.33,-672.68 4030.19,-662.48 4023.21,-662.92"/>
 </g>
 <!-- 44&#45;&gt;36 -->
-<g id="edge28" class="edge">
+<g id="edge29" class="edge">
 <title>44&#45;&gt;36</title>
-<path fill="none" stroke="black" d="M4622.61,-1409.75C4637.37,-1440.6 4653.18,-1472.71 4668.6,-1502.4 4698.78,-1560.54 4736.71,-1626.25 4760.56,-1666.78"/>
-<polygon fill="black" stroke="black" points="4760.65,-1666.93 4767.14,-1670.07 4766.75,-1677.27 4760.25,-1674.13 4760.65,-1666.93"/>
+<path fill="none" stroke="black" d="M4454.77,-1765.27C4461.56,-1815.93 4468.59,-1868.38 4473.25,-1903.1"/>
+<polygon fill="black" stroke="black" points="4473.26,-1903.17 4478.02,-1908.58 4474.85,-1915.06 4470.09,-1909.64 4473.26,-1903.17"/>
 </g>
 <!-- 45&#45;&gt;36 -->
-<g id="edge27" class="edge">
+<g id="edge28" class="edge">
 <title>45&#45;&gt;36</title>
-<path fill="none" stroke="black" d="M4783.6,-1334.07C4783.6,-1429.14 4783.6,-1590.39 4783.6,-1665.18"/>
-<polygon fill="black" stroke="black" points="4783.6,-1665.26 4787.6,-1671.26 4783.6,-1677.26 4779.6,-1671.26 4783.6,-1665.26"/>
+<path fill="none" stroke="black" d="M4635.23,-1689.3C4614.29,-1738.7 4583.86,-1804.14 4549.64,-1857.8 4539,-1874.48 4525.49,-1891.52 4513.12,-1905.95"/>
+<polygon fill="black" stroke="black" points="4513.09,-1905.98 4512.16,-1913.13 4505.2,-1915.02 4506.13,-1907.87 4513.09,-1905.98"/>
 </g>
 <!-- 46&#45;&gt;36 -->
-<g id="edge29" class="edge">
+<g id="edge30" class="edge">
 <title>46&#45;&gt;36</title>
-<path fill="none" stroke="black" d="M4882.2,-932.6C4889.01,-959.82 4894.91,-988.03 4898.6,-1015 4927.91,-1229.63 4953.78,-1292.93 4898.6,-1502.4 4882.16,-1564.81 4841.66,-1628.17 4813.4,-1667.15"/>
-<polygon fill="black" stroke="black" points="4813.27,-1667.34 4812.93,-1674.54 4806.15,-1677 4806.49,-1669.79 4813.27,-1667.34"/>
+<path fill="none" stroke="black" d="M4797.31,-1333.96C4848.06,-1484.1 4892.53,-1708.38 4779.64,-1857.8 4757.02,-1887.73 4671.2,-1910.25 4596.96,-1924.65"/>
+<polygon fill="black" stroke="black" points="4596.94,-1924.65 4591.79,-1929.7 4585.15,-1926.89 4590.3,-1921.84 4596.94,-1924.65"/>
 </g>
 <!-- 46&#45;&gt;45 -->
-<g id="edge30" class="edge">
+<g id="edge31" class="edge">
 <title>46&#45;&gt;45</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4815.88,-932.58C4807.91,-1012.86 4798.55,-1107.12 4791.97,-1173.42"/>
-<polygon fill="black" stroke="black" points="4788.48,-1173.11 4790.97,-1183.41 4795.44,-1173.8 4788.48,-1173.11"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4707.4,-1333.92C4697.32,-1399.78 4686.01,-1473.57 4677.56,-1528.75"/>
+<polygon fill="black" stroke="black" points="4674.07,-1528.41 4676.02,-1538.82 4680.99,-1529.47 4674.07,-1528.41"/>
 </g>
 <!-- 52 -->
 <g id="node14" class="node">
 <title>52</title>
-<polygon fill="#f2f2f2" stroke="black" points="592.99,-1191.9 592.99,-1325.5 816.21,-1325.5 816.21,-1191.9 592.99,-1191.9"/>
-<text text-anchor="middle" x="704.6" y="-1308.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="704.6" y="-1292.1" font-family="Times,serif" font-size="14.00">EIP712Domain</text>
-<text text-anchor="middle" x="704.6" y="-1275.3" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="592.99,-1267.1 816.21,-1267.1 "/>
-<text text-anchor="start" x="600.99" y="-1250.5" font-family="Times,serif" font-size="14.00">name: string</text>
-<text text-anchor="start" x="600.99" y="-1233.7" font-family="Times,serif" font-size="14.00">version: string</text>
-<text text-anchor="start" x="600.99" y="-1216.9" font-family="Times,serif" font-size="14.00">chainId: uint256</text>
-<text text-anchor="start" x="600.99" y="-1200.1" font-family="Times,serif" font-size="14.00">verifyingContract: address</text>
+<polygon fill="#f2f2f2" stroke="black" points="188.03,-1107.9 188.03,-1241.5 411.25,-1241.5 411.25,-1107.9 188.03,-1107.9"/>
+<text text-anchor="middle" x="299.64" y="-1224.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="299.64" y="-1208.1" font-family="Times,serif" font-size="14.00">EIP712Domain</text>
+<text text-anchor="middle" x="299.64" y="-1191.3" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="188.03,-1183.1 411.25,-1183.1 "/>
+<text text-anchor="start" x="196.03" y="-1166.5" font-family="Times,serif" font-size="14.00">name: string</text>
+<text text-anchor="start" x="196.03" y="-1149.7" font-family="Times,serif" font-size="14.00">version: string</text>
+<text text-anchor="start" x="196.03" y="-1132.9" font-family="Times,serif" font-size="14.00">chainId: uint256</text>
+<text text-anchor="start" x="196.03" y="-1116.1" font-family="Times,serif" font-size="14.00">verifyingContract: address</text>
 </g>
 <!-- 50&#45;&gt;52 -->
-<g id="edge41" class="edge">
+<g id="edge42" class="edge">
 <title>50&#45;&gt;52</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1157.71,-827.66C1044.52,-864.96 910.32,-924.6 815.6,-1015 767.74,-1060.67 736.23,-1129.48 719.06,-1182.18"/>
-<polygon fill="black" stroke="black" points="715.69,-1181.24 716.02,-1191.83 722.37,-1183.34 715.69,-1181.24"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M844.84,-820.58C710.29,-857.45 539.19,-919.08 410.64,-1015 380.53,-1037.47 354.34,-1069.49 334.87,-1098.89"/>
+<polygon fill="black" stroke="black" points="331.79,-1097.21 329.3,-1107.51 337.67,-1101.01 331.79,-1097.21"/>
 </g>
 <!-- 50&#45;&gt;53 -->
-<g id="edge42" class="edge">
+<g id="edge43" class="edge">
 <title>50&#45;&gt;53</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1591.38,-946.21C1608.77,-967.59 1624.06,-990.59 1635.6,-1015 1681.98,-1113.11 1676.79,-1417.34 1672.93,-1587.41"/>
-<polygon fill="black" stroke="black" points="1669.43,-1587.34 1672.7,-1597.41 1676.43,-1587.5 1669.43,-1587.34"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M844.81,-802.95C608.63,-839.48 253.27,-910.67 169.64,-1015 112.48,-1086.31 120.63,-1341.82 134.26,-1494.86"/>
+<polygon fill="black" stroke="black" points="130.81,-1495.6 135.2,-1505.24 137.78,-1494.97 130.81,-1495.6"/>
 </g>
 <!-- 50&#45;&gt;54 -->
-<g id="edge43" class="edge">
+<g id="edge44" class="edge">
 <title>50&#45;&gt;54</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1591.7,-812.21C1711.93,-844.86 1852.94,-904.98 1933.6,-1015 2056.71,-1182.92 2043.63,-1439 2024.94,-1587.55"/>
-<polygon fill="black" stroke="black" points="2021.45,-1587.25 2023.64,-1597.61 2028.39,-1588.14 2021.45,-1587.25"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1278.73,-912.4C1346.23,-956.38 1405.55,-998.04 1414.64,-1015 1495.89,-1166.6 1439.65,-1369.68 1391.2,-1495.9"/>
+<polygon fill="black" stroke="black" points="1387.93,-1494.64 1387.58,-1505.23 1394.46,-1497.17 1387.93,-1494.64"/>
 </g>
 <!-- 50&#45;&gt;55 -->
-<g id="edge44" class="edge">
+<g id="edge45" class="edge">
 <title>50&#45;&gt;55</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1368.9,-978.66C1367.27,-1158.48 1367.53,-1415.16 1369.67,-1570.48"/>
-<polygon fill="black" stroke="black" points="1366.18,-1570.62 1369.82,-1580.56 1373.17,-1570.52 1366.18,-1570.62"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1278.48,-848.94C1367.1,-887.39 1465.3,-941.85 1536.64,-1015 1664.44,-1146.04 1741.38,-1346.44 1783.36,-1478.61"/>
+<polygon fill="black" stroke="black" points="1780.1,-1479.92 1786.45,-1488.4 1786.78,-1477.81 1780.1,-1479.92"/>
 </g>
 <!-- 50&#45;&gt;56 -->
-<g id="edge45" class="edge">
+<g id="edge46" class="edge">
 <title>50&#45;&gt;56</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1157.46,-810.15C945.87,-850.5 645.97,-922.65 574.6,-1015 514.83,-1092.33 519.8,-1350.89 533.63,-1528.7"/>
-<polygon fill="black" stroke="black" points="530.14,-1529 534.42,-1538.69 537.12,-1528.45 530.14,-1529"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1278.62,-864.06C1345.64,-901.28 1413.58,-951.02 1458.64,-1015 1545.14,-1137.82 1571.37,-1308.46 1579.11,-1436.05"/>
+<polygon fill="black" stroke="black" points="1575.63,-1436.53 1579.7,-1446.32 1582.62,-1436.13 1575.63,-1436.53"/>
 </g>
 <!-- 57 -->
 <g id="node19" class="node">
 <title>57</title>
-<polygon fill="#f2f2f2" stroke="black" points="1411.99,-1200.3 1411.99,-1317.1 1635.21,-1317.1 1635.21,-1200.3 1411.99,-1200.3"/>
-<text text-anchor="middle" x="1523.6" y="-1300.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="1523.6" y="-1283.7" font-family="Times,serif" font-size="14.00">AppOrderOperation</text>
-<text text-anchor="middle" x="1523.6" y="-1266.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="1411.99,-1258.7 1635.21,-1258.7 "/>
-<text text-anchor="start" x="1419.99" y="-1242.1" font-family="Times,serif" font-size="14.00">order: AppOrder</text>
-<text text-anchor="start" x="1419.99" y="-1225.3" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
-<text text-anchor="start" x="1419.99" y="-1208.5" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+<polygon fill="#f2f2f2" stroke="black" points="429.03,-1116.3 429.03,-1233.1 652.25,-1233.1 652.25,-1116.3 429.03,-1116.3"/>
+<text text-anchor="middle" x="540.64" y="-1216.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="540.64" y="-1199.7" font-family="Times,serif" font-size="14.00">AppOrderOperation</text>
+<text text-anchor="middle" x="540.64" y="-1182.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="429.03,-1174.7 652.25,-1174.7 "/>
+<text text-anchor="start" x="437.03" y="-1158.1" font-family="Times,serif" font-size="14.00">order: AppOrder</text>
+<text text-anchor="start" x="437.03" y="-1141.3" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
+<text text-anchor="start" x="437.03" y="-1124.5" font-family="Times,serif" font-size="14.00">sign: bytes</text>
 </g>
 <!-- 50&#45;&gt;57 -->
-<g id="edge46" class="edge">
+<g id="edge47" class="edge">
 <title>50&#45;&gt;57</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1430.89,-978.6C1454.01,-1054.57 1479.59,-1135.58 1498.09,-1190.65"/>
-<polygon fill="black" stroke="black" points="1494.82,-1191.92 1501.34,-1200.28 1501.46,-1189.68 1494.82,-1191.92"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M844.66,-882.65C781.05,-920.27 713.61,-965.56 657.64,-1015 627.03,-1042.04 598.27,-1077.19 576.82,-1107.53"/>
+<polygon fill="black" stroke="black" points="573.8,-1105.74 570.97,-1115.95 579.55,-1109.74 573.8,-1105.74"/>
 </g>
 <!-- 58 -->
 <g id="node20" class="node">
 <title>58</title>
-<polygon fill="#f2f2f2" stroke="black" points="1709.99,-1200.3 1709.99,-1317.1 1933.21,-1317.1 1933.21,-1200.3 1709.99,-1200.3"/>
-<text text-anchor="middle" x="1821.6" y="-1300.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="1821.6" y="-1283.7" font-family="Times,serif" font-size="14.00">DatasetOrderOperation</text>
-<text text-anchor="middle" x="1821.6" y="-1266.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="1709.99,-1258.7 1933.21,-1258.7 "/>
-<text text-anchor="start" x="1717.99" y="-1242.1" font-family="Times,serif" font-size="14.00">order: DatasetOrder</text>
-<text text-anchor="start" x="1717.99" y="-1225.3" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
-<text text-anchor="start" x="1717.99" y="-1208.5" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+<polygon fill="#f2f2f2" stroke="black" points="709.03,-1116.3 709.03,-1233.1 932.25,-1233.1 932.25,-1116.3 709.03,-1116.3"/>
+<text text-anchor="middle" x="820.64" y="-1216.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="820.64" y="-1199.7" font-family="Times,serif" font-size="14.00">DatasetOrderOperation</text>
+<text text-anchor="middle" x="820.64" y="-1182.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="709.03,-1174.7 932.25,-1174.7 "/>
+<text text-anchor="start" x="717.03" y="-1158.1" font-family="Times,serif" font-size="14.00">order: DatasetOrder</text>
+<text text-anchor="start" x="717.03" y="-1141.3" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
+<text text-anchor="start" x="717.03" y="-1124.5" font-family="Times,serif" font-size="14.00">sign: bytes</text>
 </g>
 <!-- 50&#45;&gt;58 -->
-<g id="edge47" class="edge">
+<g id="edge48" class="edge">
 <title>50&#45;&gt;58</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1591.66,-923.07C1625.71,-951.2 1658.78,-982.19 1686.6,-1015 1731.32,-1067.76 1765.94,-1139.07 1789.14,-1190.73"/>
-<polygon fill="black" stroke="black" points="1786.07,-1192.43 1793.34,-1200.14 1792.46,-1189.58 1786.07,-1192.43"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M931.57,-978.68C903.52,-1025.21 876.17,-1071.41 855.61,-1107.15"/>
+<polygon fill="black" stroke="black" points="852.47,-1105.59 850.54,-1116 858.55,-1109.07 852.47,-1105.59"/>
 </g>
 <!-- 59 -->
 <g id="node21" class="node">
 <title>59</title>
-<polygon fill="#f2f2f2" stroke="black" points="1113.99,-1200.3 1113.99,-1317.1 1337.21,-1317.1 1337.21,-1200.3 1113.99,-1200.3"/>
-<text text-anchor="middle" x="1225.6" y="-1300.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="1225.6" y="-1283.7" font-family="Times,serif" font-size="14.00">WorkerpoolOrderOperation</text>
-<text text-anchor="middle" x="1225.6" y="-1266.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="1113.99,-1258.7 1337.21,-1258.7 "/>
-<text text-anchor="start" x="1121.99" y="-1242.1" font-family="Times,serif" font-size="14.00">order: WorkerpoolOrder</text>
-<text text-anchor="start" x="1121.99" y="-1225.3" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
-<text text-anchor="start" x="1121.99" y="-1208.5" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+<polygon fill="#f2f2f2" stroke="black" points="1191.03,-1116.3 1191.03,-1233.1 1414.25,-1233.1 1414.25,-1116.3 1191.03,-1116.3"/>
+<text text-anchor="middle" x="1302.64" y="-1216.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="1302.64" y="-1199.7" font-family="Times,serif" font-size="14.00">WorkerpoolOrderOperation</text>
+<text text-anchor="middle" x="1302.64" y="-1182.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="1191.03,-1174.7 1414.25,-1174.7 "/>
+<text text-anchor="start" x="1199.03" y="-1158.1" font-family="Times,serif" font-size="14.00">order: WorkerpoolOrder</text>
+<text text-anchor="start" x="1199.03" y="-1141.3" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
+<text text-anchor="start" x="1199.03" y="-1124.5" font-family="Times,serif" font-size="14.00">sign: bytes</text>
 </g>
 <!-- 50&#45;&gt;59 -->
-<g id="edge48" class="edge">
+<g id="edge49" class="edge">
 <title>50&#45;&gt;59</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1304.95,-978.6C1281.28,-1054.41 1256.98,-1135.25 1241.52,-1190.3"/>
-<polygon fill="black" stroke="black" points="1238.05,-1189.7 1238.74,-1200.28 1244.8,-1191.58 1238.05,-1189.7"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1178.21,-978.68C1206.33,-1025.21 1234.72,-1071.41 1257.3,-1107.15"/>
+<polygon fill="black" stroke="black" points="1254.6,-1109.43 1262.91,-1116 1260.51,-1105.68 1254.6,-1109.43"/>
 </g>
 <!-- 60 -->
 <g id="node22" class="node">
 <title>60</title>
-<polygon fill="#f2f2f2" stroke="black" points="833.99,-1200.3 833.99,-1317.1 1057.21,-1317.1 1057.21,-1200.3 833.99,-1200.3"/>
-<text text-anchor="middle" x="945.6" y="-1300.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="945.6" y="-1283.7" font-family="Times,serif" font-size="14.00">RequestOrderOperation</text>
-<text text-anchor="middle" x="945.6" y="-1266.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="833.99,-1258.7 1057.21,-1258.7 "/>
-<text text-anchor="start" x="841.99" y="-1242.1" font-family="Times,serif" font-size="14.00">order: RequestOrder</text>
-<text text-anchor="start" x="841.99" y="-1225.3" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
-<text text-anchor="start" x="841.99" y="-1208.5" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+<polygon fill="#f2f2f2" stroke="black" points="950.03,-1116.3 950.03,-1233.1 1173.25,-1233.1 1173.25,-1116.3 950.03,-1116.3"/>
+<text text-anchor="middle" x="1061.64" y="-1216.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="1061.64" y="-1199.7" font-family="Times,serif" font-size="14.00">RequestOrderOperation</text>
+<text text-anchor="middle" x="1061.64" y="-1182.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="950.03,-1174.7 1173.25,-1174.7 "/>
+<text text-anchor="start" x="958.03" y="-1158.1" font-family="Times,serif" font-size="14.00">order: RequestOrder</text>
+<text text-anchor="start" x="958.03" y="-1141.3" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
+<text text-anchor="start" x="958.03" y="-1124.5" font-family="Times,serif" font-size="14.00">sign: bytes</text>
 </g>
 <!-- 50&#45;&gt;60 -->
-<g id="edge49" class="edge">
+<g id="edge50" class="edge">
 <title>50&#45;&gt;60</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1157.8,-920.05C1123.57,-949.19 1090.37,-981.3 1062.6,-1015 1018.69,-1068.29 984,-1139.37 963.88,-1190.82"/>
-<polygon fill="black" stroke="black" points="960.6,-1189.6 960.29,-1200.19 967.14,-1192.11 960.6,-1189.6"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1054.89,-978.68C1054.92,-1024.62 1055.43,-1070.23 1056.42,-1105.78"/>
+<polygon fill="black" stroke="black" points="1052.93,-1106.11 1056.72,-1116 1059.92,-1105.9 1052.93,-1106.11"/>
 </g>
 <!-- 51 -->
 <g id="node13" class="node">
 <title>51</title>
-<polygon fill="#f2f2f2" stroke="black" points="997.99,-1656.5 997.99,-1756.5 1221.21,-1756.5 1221.21,-1656.5 997.99,-1656.5"/>
-<text text-anchor="middle" x="1109.6" y="-1739.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Enum&gt;&gt;</text>
-<text text-anchor="middle" x="1109.6" y="-1723.1" font-family="Times,serif" font-size="14.00">OrderOperationEnum</text>
-<text text-anchor="middle" x="1109.6" y="-1706.3" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="997.99,-1698.1 1221.21,-1698.1 "/>
-<text text-anchor="start" x="1005.99" y="-1681.5" font-family="Times,serif" font-size="14.00">SIGN: 0</text>
-<text text-anchor="start" x="1005.99" y="-1664.7" font-family="Times,serif" font-size="14.00">CLOSE: 1</text>
+<polygon fill="#f2f2f2" stroke="black" points="639.03,-1564.1 639.03,-1664.1 862.25,-1664.1 862.25,-1564.1 639.03,-1564.1"/>
+<text text-anchor="middle" x="750.64" y="-1647.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Enum&gt;&gt;</text>
+<text text-anchor="middle" x="750.64" y="-1630.7" font-family="Times,serif" font-size="14.00">OrderOperationEnum</text>
+<text text-anchor="middle" x="750.64" y="-1613.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="639.03,-1605.7 862.25,-1605.7 "/>
+<text text-anchor="start" x="647.03" y="-1589.1" font-family="Times,serif" font-size="14.00">SIGN: 0</text>
+<text text-anchor="start" x="647.03" y="-1572.3" font-family="Times,serif" font-size="14.00">CLOSE: 1</text>
 </g>
 <!-- 51&#45;&gt;50 -->
-<g id="edge31" class="edge">
+<g id="edge32" class="edge">
 <title>51&#45;&gt;50</title>
-<path fill="none" stroke="black" d="M1104.03,-1656.28C1089.2,-1518.14 1053.3,-1129.46 1104.6,-1015 1116.06,-989.43 1131.73,-965.46 1149.79,-943.31"/>
-<polygon fill="black" stroke="black" points="1149.95,-943.11 1150.75,-935.95 1157.67,-933.92 1156.88,-941.09 1149.95,-943.11"/>
+<path fill="none" stroke="black" d="M739.66,-1563.94C712.7,-1438.44 648.99,-1109.49 699.64,-1015 730.18,-958.01 780.82,-912.21 834.69,-876.49"/>
+<polygon fill="black" stroke="black" points="834.71,-876.47 837.57,-869.85 844.78,-869.94 841.92,-876.56 834.71,-876.47"/>
 </g>
 <!-- 52&#45;&gt;50 -->
-<g id="edge32" class="edge">
+<g id="edge33" class="edge">
 <title>52&#45;&gt;50</title>
-<path fill="none" stroke="black" d="M730.44,-1191.83C750.38,-1138.14 782.76,-1063.52 833.6,-1015 920.62,-931.94 1040.98,-874.85 1146.09,-837.2"/>
-<polygon fill="black" stroke="black" points="1146.2,-837.16 1150.53,-831.38 1157.52,-833.16 1153.19,-838.93 1146.2,-837.16"/>
+<path fill="none" stroke="black" d="M345.47,-1107.51C367.21,-1075.91 395.56,-1039.69 428.64,-1015 548.45,-925.6 705.2,-865.99 832.76,-828.46"/>
+<polygon fill="black" stroke="black" points="833.1,-828.36 837.74,-822.84 844.62,-825.01 839.97,-830.52 833.1,-828.36"/>
 </g>
 <!-- 53&#45;&gt;50 -->
-<g id="edge33" class="edge">
+<g id="edge34" class="edge">
 <title>53&#45;&gt;50</title>
-<path fill="none" stroke="black" d="M1683.97,-1597.41C1694.56,-1429.55 1700.9,-1115.06 1653.6,-1015 1639.97,-986.18 1621.13,-959.32 1599.61,-934.79"/>
-<polygon fill="black" stroke="black" points="1599.6,-934.77 1592.61,-932.99 1591.57,-925.85 1598.56,-927.63 1599.6,-934.77"/>
+<path fill="none" stroke="black" d="M146.96,-1505.24C139.04,-1353.66 129.16,-1087.95 187.64,-1015 268.32,-914.35 601.85,-844.55 832.75,-806.95"/>
+<polygon fill="black" stroke="black" points="832.85,-806.94 838.13,-802.03 844.7,-805.02 839.41,-809.93 832.85,-806.94"/>
 </g>
 <!-- 54&#45;&gt;50 -->
-<g id="edge34" class="edge">
+<g id="edge35" class="edge">
 <title>54&#45;&gt;50</title>
-<path fill="none" stroke="black" d="M2035.7,-1597.61C2060.96,-1450.81 2077.54,-1186.78 1951.6,-1015 1870.01,-903.71 1726.67,-843.48 1603.25,-811.09"/>
-<polygon fill="black" stroke="black" points="1603,-811.03 1596.19,-813.41 1591.37,-808.04 1598.18,-805.66 1603,-811.03"/>
+<path fill="none" stroke="black" d="M1400.47,-1505.23C1454.75,-1379.87 1515.92,-1170.39 1432.64,-1015 1423.24,-997.47 1360.2,-953.56 1288.66,-907.97"/>
+<polygon fill="black" stroke="black" points="1288.65,-907.96 1281.44,-908.12 1278.52,-901.53 1285.72,-901.37 1288.65,-907.96"/>
 </g>
 <!-- 55&#45;&gt;50 -->
-<g id="edge35" class="edge">
+<g id="edge36" class="edge">
 <title>55&#45;&gt;50</title>
-<path fill="none" stroke="black" d="M1379.38,-1580.56C1381.6,-1429.86 1381.94,-1173.98 1380.4,-990.88"/>
-<polygon fill="black" stroke="black" points="1380.4,-990.66 1376.35,-984.69 1380.3,-978.66 1384.35,-984.62 1380.4,-990.66"/>
+<path fill="none" stroke="black" d="M1799.74,-1488.4C1763.2,-1356.52 1685.64,-1149.32 1554.64,-1015 1481.84,-940.35 1381.06,-885.16 1289.57,-846.6"/>
+<polygon fill="black" stroke="black" points="1289.54,-846.59 1282.46,-847.98 1278.46,-841.98 1285.53,-840.59 1289.54,-846.59"/>
 </g>
 <!-- 56&#45;&gt;50 -->
-<g id="edge36" class="edge">
+<g id="edge37" class="edge">
 <title>56&#45;&gt;50</title>
-<path fill="none" stroke="black" d="M547.51,-1538.69C538.01,-1360.74 531.7,-1093.79 592.6,-1015 661.11,-926.36 940.15,-856.32 1145.48,-815.16"/>
-<polygon fill="black" stroke="black" points="1145.58,-815.14 1150.69,-810.05 1157.35,-812.8 1152.25,-817.89 1145.58,-815.14"/>
+<path fill="none" stroke="black" d="M1594.37,-1446.32C1590.74,-1317.73 1565.48,-1141.15 1476.64,-1015 1430.19,-949.05 1359.42,-898.22 1289.4,-860.65"/>
+<polygon fill="black" stroke="black" points="1289.24,-860.56 1282.07,-861.3 1278.63,-854.96 1285.8,-854.23 1289.24,-860.56"/>
 </g>
 <!-- 57&#45;&gt;50 -->
-<g id="edge37" class="edge">
+<g id="edge38" class="edge">
 <title>57&#45;&gt;50</title>
-<path fill="none" stroke="black" d="M1510.45,-1200.28C1495.99,-1148.01 1471.88,-1067.47 1447.93,-990.44"/>
-<polygon fill="black" stroke="black" points="1447.82,-990.06 1442.21,-985.52 1444.25,-978.6 1449.85,-983.14 1447.82,-990.06"/>
+<path fill="none" stroke="black" d="M586.77,-1115.95C610.88,-1083.87 642.15,-1044.58 675.64,-1015 723.49,-972.73 779.71,-933.51 834.23,-899.5"/>
+<polygon fill="black" stroke="black" points="834.54,-899.31 837.54,-892.75 844.74,-893 841.75,-899.56 834.54,-899.31"/>
 </g>
 <!-- 57&#45;&gt;51 -->
-<g id="edge51" class="edge">
+<g id="edge52" class="edge">
 <title>57&#45;&gt;51</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1494.37,-1317.1C1464.05,-1371.52 1411.94,-1452.21 1346.6,-1502.4 1311.45,-1529.4 1289.81,-1512.85 1253.6,-1538.4 1211.74,-1567.93 1174.3,-1612.23 1148.1,-1647.8"/>
-<polygon fill="black" stroke="black" points="1145.06,-1646.02 1142.02,-1656.17 1150.73,-1650.14 1145.06,-1646.02"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M568.31,-1233.33C608.4,-1316.85 682.26,-1470.67 722.57,-1554.65"/>
+<polygon fill="black" stroke="black" points="719.48,-1556.29 726.96,-1563.79 725.79,-1553.26 719.48,-1556.29"/>
 </g>
 <!-- 57&#45;&gt;53 -->
-<g id="edge50" class="edge">
+<g id="edge51" class="edge">
 <title>57&#45;&gt;53</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1542.92,-1317.52C1565.69,-1385.65 1604.1,-1500.57 1633.23,-1587.71"/>
-<polygon fill="black" stroke="black" points="1629.97,-1589.01 1636.46,-1597.38 1636.61,-1586.79 1629.97,-1589.01"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M499.78,-1233.2C477.3,-1263.93 448.4,-1302.01 420.64,-1334.4 372.9,-1390.11 316.93,-1448.85 268.35,-1497.96"/>
+<polygon fill="black" stroke="black" points="265.8,-1495.57 261.24,-1505.14 270.77,-1500.5 265.8,-1495.57"/>
 </g>
 <!-- 58&#45;&gt;50 -->
-<g id="edge38" class="edge">
+<g id="edge39" class="edge">
 <title>58&#45;&gt;50</title>
-<path fill="none" stroke="black" d="M1807.36,-1200.14C1788.22,-1148.02 1752.1,-1071.04 1704.6,-1015 1674.49,-979.49 1638.23,-946.11 1600.91,-916.18"/>
-<polygon fill="black" stroke="black" points="1600.81,-916.09 1593.62,-915.5 1591.41,-908.64 1598.59,-909.23 1600.81,-916.09"/>
+<path fill="none" stroke="black" d="M860.37,-1116C882.14,-1081.75 910.39,-1035.94 938.81,-989.02"/>
+<polygon fill="black" stroke="black" points="938.85,-988.95 938.53,-981.74 945.06,-978.68 945.38,-985.88 938.85,-988.95"/>
 </g>
 <!-- 58&#45;&gt;51 -->
-<g id="edge53" class="edge">
+<g id="edge54" class="edge">
 <title>58&#45;&gt;51</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1797.12,-1317.24C1769.28,-1374.85 1717.96,-1460.76 1644.6,-1502.4 1492.83,-1588.54 1408.74,-1458.49 1253.6,-1538.4 1206.28,-1562.77 1167.89,-1609.94 1142.69,-1647.96"/>
-<polygon fill="black" stroke="black" points="1139.71,-1646.12 1137.2,-1656.42 1145.58,-1649.93 1139.71,-1646.12"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M811.42,-1233.33C798.09,-1316.59 773.58,-1469.74 760.12,-1553.88"/>
+<polygon fill="black" stroke="black" points="756.65,-1553.36 758.53,-1563.79 763.57,-1554.47 756.65,-1553.36"/>
 </g>
 <!-- 58&#45;&gt;54 -->
-<g id="edge52" class="edge">
+<g id="edge53" class="edge">
 <title>58&#45;&gt;54</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1845.85,-1317.52C1874.46,-1385.72 1922.73,-1500.8 1959.3,-1587.97"/>
-<polygon fill="black" stroke="black" points="1956.15,-1589.52 1963.25,-1597.38 1962.6,-1586.81 1956.15,-1589.52"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M857.49,-1233.22C879.44,-1265.04 909.11,-1304.15 940.64,-1334.4 1026.24,-1416.54 1138.13,-1492.03 1222.13,-1543.67"/>
+<polygon fill="black" stroke="black" points="1220.32,-1546.66 1230.68,-1548.9 1223.98,-1540.69 1220.32,-1546.66"/>
 </g>
 <!-- 59&#45;&gt;50 -->
-<g id="edge39" class="edge">
+<g id="edge40" class="edge">
 <title>59&#45;&gt;50</title>
-<path fill="none" stroke="black" d="M1247.85,-1200.28C1265.61,-1148.01 1291.15,-1067.47 1314.69,-990.44"/>
-<polygon fill="black" stroke="black" points="1314.8,-990.08 1312.72,-983.18 1318.3,-978.6 1320.38,-985.51 1314.8,-990.08"/>
+<path fill="none" stroke="black" d="M1272.74,-1116C1253.17,-1081.75 1226.14,-1035.94 1197.94,-989.02"/>
+<polygon fill="black" stroke="black" points="1197.9,-988.96 1191.38,-985.88 1191.71,-978.68 1198.23,-981.76 1197.9,-988.96"/>
 </g>
 <!-- 59&#45;&gt;51 -->
-<g id="edge55" class="edge">
+<g id="edge56" class="edge">
 <title>59&#45;&gt;51</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1210.55,-1317.52C1188.41,-1402.62 1147.26,-1560.74 1124.95,-1646.5"/>
-<polygon fill="black" stroke="black" points="1121.52,-1645.78 1122.39,-1656.34 1128.29,-1647.54 1121.52,-1645.78"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1266.43,-1233.25C1244.58,-1265.27 1214.79,-1304.56 1182.64,-1334.4 1082.51,-1427.34 947.68,-1508.77 855.44,-1559.23"/>
+<polygon fill="black" stroke="black" points="853.76,-1556.16 846.65,-1564.02 857.11,-1562.31 853.76,-1556.16"/>
 </g>
 <!-- 59&#45;&gt;55 -->
-<g id="edge54" class="edge">
+<g id="edge55" class="edge">
 <title>59&#45;&gt;55</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1244.92,-1317.52C1266.27,-1381.38 1301.35,-1486.36 1329.65,-1571.03"/>
-<polygon fill="black" stroke="black" points="1326.4,-1572.35 1332.89,-1580.72 1333.04,-1570.13 1326.4,-1572.35"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1414.3,-1207.57C1502.35,-1237.49 1623.43,-1289.85 1704.64,-1370.4 1735.23,-1400.74 1759.29,-1440.46 1777.59,-1478.96"/>
+<polygon fill="black" stroke="black" points="1774.49,-1480.6 1781.88,-1488.19 1780.84,-1477.65 1774.49,-1480.6"/>
 </g>
 <!-- 60&#45;&gt;50 -->
-<g id="edge40" class="edge">
+<g id="edge41" class="edge">
 <title>60&#45;&gt;50</title>
-<path fill="none" stroke="black" d="M974.34,-1200.19C997.72,-1148.29 1033.95,-1071.61 1080.6,-1015 1100.95,-990.29 1124.23,-966.45 1148.57,-943.99"/>
-<polygon fill="black" stroke="black" points="1148.71,-943.87 1150.46,-936.87 1157.59,-935.79 1155.84,-942.78 1148.71,-943.87"/>
+<path fill="none" stroke="black" d="M1066.55,-1116C1067.65,-1082.18 1068.25,-1037.09 1068.37,-990.79"/>
+<polygon fill="black" stroke="black" points="1068.37,-990.68 1064.38,-984.67 1068.39,-978.68 1072.38,-984.69 1068.37,-990.68"/>
 </g>
 <!-- 60&#45;&gt;51 -->
-<g id="edge57" class="edge">
+<g id="edge58" class="edge">
 <title>60&#45;&gt;51</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M966.87,-1317.52C998.21,-1402.71 1056.46,-1561.06 1087.99,-1646.76"/>
-<polygon fill="black" stroke="black" points="1084.77,-1648.16 1091.51,-1656.34 1091.34,-1645.75 1084.77,-1648.16"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1020.66,-1233.33C961.1,-1317.1 851.24,-1471.61 791.66,-1555.41"/>
+<polygon fill="black" stroke="black" points="788.64,-1553.61 785.7,-1563.79 794.35,-1557.67 788.64,-1553.61"/>
 </g>
 <!-- 60&#45;&gt;56 -->
-<g id="edge56" class="edge">
+<g id="edge57" class="edge">
 <title>60&#45;&gt;56</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M925.93,-1317.29C906.18,-1369.43 872.04,-1446.42 825.6,-1502.4 783.65,-1552.97 726.71,-1598.17 675.94,-1633.02"/>
-<polygon fill="black" stroke="black" points="673.83,-1630.22 667.52,-1638.74 677.76,-1636.01 673.83,-1630.22"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1089.91,-1233.27C1110.36,-1268.48 1141.44,-1311.11 1181.64,-1334.4 1290.96,-1397.75 1360.75,-1297.06 1463.64,-1370.4 1488.05,-1387.8 1507.75,-1411.6 1523.57,-1437.53"/>
+<polygon fill="black" stroke="black" points="1520.7,-1439.55 1528.79,-1446.4 1526.73,-1436.01 1520.7,-1439.55"/>
 </g>
 <!-- 61&#45;&gt;62 -->
-<g id="edge59" class="edge">
+<g id="edge60" class="edge">
 <title>61&#45;&gt;62</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4163.68,-844.33C4162.53,-887.56 4161.92,-945.92 4161.85,-1005.15"/>
-<polygon fill="black" stroke="black" points="4158.35,-1005.44 4161.85,-1015.44 4165.35,-1005.44 4158.35,-1005.44"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3887,-1245.98C3894.62,-1278.24 3904.73,-1318.66 3915.62,-1360.78"/>
+<polygon fill="black" stroke="black" points="3912.28,-1361.85 3918.18,-1370.65 3919.06,-1360.1 3912.28,-1361.85"/>
 </g>
 <!-- 62&#45;&gt;24 -->
-<g id="edge62" class="edge">
+<g id="edge63" class="edge">
 <title>62&#45;&gt;24</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4095.71,-1502.17C4079.54,-1555.97 4063.83,-1608.24 4052.39,-1646.31"/>
-<polygon fill="black" stroke="black" points="4048.95,-1645.58 4049.43,-1656.17 4055.66,-1647.6 4048.95,-1645.58"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3972.39,-1857.5C3971.77,-1866.78 3971.17,-1875.63 3970.62,-1883.87"/>
+<polygon fill="black" stroke="black" points="3967.12,-1883.76 3969.95,-1893.97 3974.11,-1884.23 3967.12,-1883.76"/>
 </g>
 <!-- 62&#45;&gt;36 -->
-<g id="edge61" class="edge">
+<g id="edge62" class="edge">
 <title>62&#45;&gt;36</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4429.81,-1495.9C4432.74,-1498.09 4435.67,-1500.26 4438.6,-1502.4 4531.22,-1570.24 4647.96,-1635.09 4719.12,-1672.57"/>
-<polygon fill="black" stroke="black" points="4717.51,-1675.68 4728,-1677.22 4720.77,-1669.48 4717.51,-1675.68"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4249.92,-1834.04C4262.15,-1842.32 4274.42,-1850.29 4286.64,-1857.8 4307.03,-1870.33 4356.93,-1892.47 4400.75,-1911.08"/>
+<polygon fill="black" stroke="black" points="4399.42,-1914.32 4409.99,-1914.99 4402.15,-1907.87 4399.42,-1914.32"/>
 </g>
 <!-- 62&#45;&gt;61 -->
-<g id="edge58" class="edge">
+<g id="edge59" class="edge">
 <title>62&#45;&gt;61</title>
-<path fill="none" stroke="black" d="M4175.35,-1015.44C4175.34,-958.11 4174.83,-900.83 4173.82,-856.49"/>
-<polygon fill="black" stroke="black" points="4173.81,-856.33 4169.67,-850.43 4173.52,-844.33 4177.66,-850.23 4173.81,-856.33"/>
+<path fill="none" stroke="black" d="M3931.61,-1370.65C3920.8,-1330 3909.96,-1290.45 3900.61,-1257.72"/>
+<polygon fill="black" stroke="black" points="3900.55,-1257.51 3895.04,-1252.85 3897.23,-1245.98 3902.73,-1250.64 3900.55,-1257.51"/>
 </g>
-<!-- 63 -->
-<g id="node25" class="node">
-<title>63</title>
-<polygon fill="#f2f2f2" stroke="black" points="4187.87,-1656.5 4187.87,-1756.5 4417.32,-1756.5 4417.32,-1656.5 4187.87,-1656.5"/>
-<text text-anchor="middle" x="4302.6" y="-1739.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
-<text text-anchor="middle" x="4302.6" y="-1723.1" font-family="Times,serif" font-size="14.00">IRegistry</text>
-<text text-anchor="middle" x="4302.6" y="-1706.3" font-family="Times,serif" font-size="14.00">contracts/registries/IRegistry.sol</text>
-<polyline fill="none" stroke="black" points="4187.87,-1698.1 4417.32,-1698.1 "/>
-<text text-anchor="start" x="4195.87" y="-1681.5" font-family="Times,serif" font-size="14.00">External:</text>
-<text text-anchor="start" x="4195.87" y="-1664.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;isRegistered(_entry: address): bool</text>
-</g>
-<!-- 62&#45;&gt;63 -->
-<g id="edge60" class="edge">
-<title>62&#45;&gt;63</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4241.48,-1502.17C4257.65,-1555.97 4273.36,-1608.24 4284.81,-1646.31"/>
-<polygon fill="black" stroke="black" points="4281.54,-1647.6 4287.77,-1656.17 4288.24,-1645.58 4281.54,-1647.6"/>
+<!-- 64 -->
+<g id="node26" class="node">
+<title>64</title>
+<polygon fill="#f2f2f2" stroke="black" points="4119.91,-1894.3 4119.91,-1994.3 4349.36,-1994.3 4349.36,-1894.3 4119.91,-1894.3"/>
+<text text-anchor="middle" x="4234.64" y="-1977.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
+<text text-anchor="middle" x="4234.64" y="-1960.9" font-family="Times,serif" font-size="14.00">IRegistry</text>
+<text text-anchor="middle" x="4234.64" y="-1944.1" font-family="Times,serif" font-size="14.00">contracts/registries/IRegistry.sol</text>
+<polyline fill="none" stroke="black" points="4119.91,-1935.9 4349.36,-1935.9 "/>
+<text text-anchor="start" x="4127.91" y="-1919.3" font-family="Times,serif" font-size="14.00">External:</text>
+<text text-anchor="start" x="4127.91" y="-1902.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;isRegistered(_entry: address): bool</text>
+</g>
+<!-- 62&#45;&gt;64 -->
+<g id="edge61" class="edge">
+<title>62&#45;&gt;64</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4170.33,-1857.5C4177.82,-1867.5 4184.94,-1877 4191.52,-1885.78"/>
+<polygon fill="black" stroke="black" points="4188.86,-1888.07 4197.66,-1893.97 4194.47,-1883.87 4188.86,-1888.07"/>
+</g>
+<!-- 63&#45;&gt;61 -->
+<g id="edge64" class="edge">
+<title>63&#45;&gt;61</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3993.78,-873.8C3966.53,-941.81 3930.9,-1030.76 3905.53,-1094.08"/>
+<polygon fill="black" stroke="black" points="3902.18,-1093.04 3901.71,-1103.63 3908.68,-1095.65 3902.18,-1093.04"/>
+</g>
+<!-- 63&#45;&gt;62 -->
+<g id="edge65" class="edge">
+<title>63&#45;&gt;62</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4032.04,-873.79C4029.82,-985.84 4024.87,-1173.34 4014.64,-1334.4 4014.09,-1343.03 4013.49,-1351.81 4012.85,-1360.68"/>
+<polygon fill="black" stroke="black" points="4009.36,-1360.49 4012.12,-1370.72 4016.34,-1361 4009.36,-1360.49"/>
 </g>
 </g>
 </svg>
diff --git a/docs/uml/class-uml-IexecPocoFacets.svg b/docs/uml/class-uml-IexecPocoFacets.svg
index 49bedeb83..bca055427 100644
--- a/docs/uml/class-uml-IexecPocoFacets.svg
+++ b/docs/uml/class-uml-IexecPocoFacets.svg
@@ -4,1053 +4,1086 @@
 <!-- Generated by graphviz version 5.0.0 (20220707.1540)
  -->
 <!-- Title: UmlClassDiagram Pages: 1 -->
-<svg width="6824pt" height="2194pt"
- viewBox="0.00 0.00 6823.61 2193.80" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 2189.8)">
+<svg width="5917pt" height="2331pt"
+ viewBox="0.00 0.00 5916.82 2330.80" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 2326.8)">
 <title>UmlClassDiagram</title>
-<polygon fill="white" stroke="transparent" points="-4,4 -4,-2189.8 6819.61,-2189.8 6819.61,4 -4,4"/>
+<polygon fill="white" stroke="transparent" points="-4,4 -4,-2326.8 5912.82,-2326.8 5912.82,4 -4,4"/>
 <!-- 3 -->
 <g id="node1" class="node">
 <title>3</title>
-<polygon fill="#f2f2f2" stroke="black" points="5182.01,-477.9 5182.01,-787.5 5491.21,-787.5 5491.21,-477.9 5182.01,-477.9"/>
-<text text-anchor="middle" x="5336.61" y="-770.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Abstract&gt;&gt;</text>
-<text text-anchor="middle" x="5336.61" y="-754.1" font-family="Times,serif" font-size="14.00">FacetBase</text>
-<text text-anchor="middle" x="5336.61" y="-737.3" font-family="Times,serif" font-size="14.00">contracts/abstract/FacetBase.sol</text>
-<polyline fill="none" stroke="black" points="5182.01,-729.1 5491.21,-729.1 "/>
-<text text-anchor="start" x="5190.01" y="-712.5" font-family="Times,serif" font-size="14.00">Internal:</text>
-<text text-anchor="start" x="5190.01" y="-695.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;CONTRIBUTION_DEADLINE_RATIO: uint256</text>
-<text text-anchor="start" x="5190.01" y="-678.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;REVEAL_DEADLINE_RATIO: uint256</text>
-<text text-anchor="start" x="5190.01" y="-662.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;FINAL_DEADLINE_RATIO: uint256</text>
-<text text-anchor="start" x="5190.01" y="-645.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;WORKERPOOL_STAKE_RATIO: uint256</text>
-<text text-anchor="start" x="5190.01" y="-628.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;KITTY_RATIO: uint256</text>
-<text text-anchor="start" x="5190.01" y="-611.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;KITTY_MIN: uint256</text>
-<text text-anchor="start" x="5190.01" y="-594.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;KITTY_ADDRESS: address</text>
-<text text-anchor="start" x="5190.01" y="-578.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;GROUPMEMBER_PURPOSE: uint256</text>
-<polyline fill="none" stroke="black" points="5182.01,-569.9 5491.21,-569.9 "/>
-<text text-anchor="start" x="5190.01" y="-553.3" font-family="Times,serif" font-size="14.00">Internal:</text>
-<text text-anchor="start" x="5190.01" y="-536.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;owner(): address</text>
-<text text-anchor="start" x="5190.01" y="-519.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_msgSender(): address</text>
-<text text-anchor="start" x="5190.01" y="-502.9" font-family="Times,serif" font-size="14.00">Public:</text>
-<text text-anchor="start" x="5190.01" y="-486.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;modifier&gt;&gt; onlyOwner()</text>
+<polygon fill="#f2f2f2" stroke="black" points="3564.06,-477.9 3564.06,-787.5 3873.25,-787.5 3873.25,-477.9 3564.06,-477.9"/>
+<text text-anchor="middle" x="3718.65" y="-770.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Abstract&gt;&gt;</text>
+<text text-anchor="middle" x="3718.65" y="-754.1" font-family="Times,serif" font-size="14.00">FacetBase</text>
+<text text-anchor="middle" x="3718.65" y="-737.3" font-family="Times,serif" font-size="14.00">contracts/abstract/FacetBase.sol</text>
+<polyline fill="none" stroke="black" points="3564.06,-729.1 3873.25,-729.1 "/>
+<text text-anchor="start" x="3572.06" y="-712.5" font-family="Times,serif" font-size="14.00">Internal:</text>
+<text text-anchor="start" x="3572.06" y="-695.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;CONTRIBUTION_DEADLINE_RATIO: uint256</text>
+<text text-anchor="start" x="3572.06" y="-678.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;REVEAL_DEADLINE_RATIO: uint256</text>
+<text text-anchor="start" x="3572.06" y="-662.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;FINAL_DEADLINE_RATIO: uint256</text>
+<text text-anchor="start" x="3572.06" y="-645.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;WORKERPOOL_STAKE_RATIO: uint256</text>
+<text text-anchor="start" x="3572.06" y="-628.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;KITTY_RATIO: uint256</text>
+<text text-anchor="start" x="3572.06" y="-611.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;KITTY_MIN: uint256</text>
+<text text-anchor="start" x="3572.06" y="-594.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;KITTY_ADDRESS: address</text>
+<text text-anchor="start" x="3572.06" y="-578.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;GROUPMEMBER_PURPOSE: uint256</text>
+<polyline fill="none" stroke="black" points="3564.06,-569.9 3873.25,-569.9 "/>
+<text text-anchor="start" x="3572.06" y="-553.3" font-family="Times,serif" font-size="14.00">Internal:</text>
+<text text-anchor="start" x="3572.06" y="-536.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;owner(): address</text>
+<text text-anchor="start" x="3572.06" y="-519.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_msgSender(): address</text>
+<text text-anchor="start" x="3572.06" y="-502.9" font-family="Times,serif" font-size="14.00">Public:</text>
+<text text-anchor="start" x="3572.06" y="-486.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;modifier&gt;&gt; onlyOwner()</text>
 </g>
 <!-- 10 -->
 <g id="node2" class="node">
 <title>10</title>
-<polygon fill="#f2f2f2" stroke="black" points="2489.4,-532.3 2489.4,-733.1 2711.81,-733.1 2711.81,-532.3 2489.4,-532.3"/>
-<text text-anchor="middle" x="2600.61" y="-716.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="2600.61" y="-699.7" font-family="Times,serif" font-size="14.00">Matching</text>
-<text text-anchor="middle" x="2600.61" y="-682.9" font-family="Times,serif" font-size="14.00">contracts/facets/IexecPoco1Facet.sol</text>
-<polyline fill="none" stroke="black" points="2489.4,-674.7 2711.81,-674.7 "/>
-<text text-anchor="start" x="2497.4" y="-658.1" font-family="Times,serif" font-size="14.00">apporderHash: bytes32</text>
-<text text-anchor="start" x="2497.4" y="-641.3" font-family="Times,serif" font-size="14.00">appOwner: address</text>
-<text text-anchor="start" x="2497.4" y="-624.5" font-family="Times,serif" font-size="14.00">datasetorderHash: bytes32</text>
-<text text-anchor="start" x="2497.4" y="-607.7" font-family="Times,serif" font-size="14.00">datasetOwner: address</text>
-<text text-anchor="start" x="2497.4" y="-590.9" font-family="Times,serif" font-size="14.00">workerpoolorderHash: bytes32</text>
-<text text-anchor="start" x="2497.4" y="-574.1" font-family="Times,serif" font-size="14.00">workerpoolOwner: address</text>
-<text text-anchor="start" x="2497.4" y="-557.3" font-family="Times,serif" font-size="14.00">requestorderHash: bytes32</text>
-<text text-anchor="start" x="2497.4" y="-540.5" font-family="Times,serif" font-size="14.00">hasDataset: bool</text>
+<polygon fill="#f2f2f2" stroke="black" points="1839.45,-532.3 1839.45,-733.1 2061.86,-733.1 2061.86,-532.3 1839.45,-532.3"/>
+<text text-anchor="middle" x="1950.65" y="-716.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="1950.65" y="-699.7" font-family="Times,serif" font-size="14.00">Matching</text>
+<text text-anchor="middle" x="1950.65" y="-682.9" font-family="Times,serif" font-size="14.00">contracts/facets/IexecPoco1Facet.sol</text>
+<polyline fill="none" stroke="black" points="1839.45,-674.7 2061.86,-674.7 "/>
+<text text-anchor="start" x="1847.45" y="-658.1" font-family="Times,serif" font-size="14.00">apporderHash: bytes32</text>
+<text text-anchor="start" x="1847.45" y="-641.3" font-family="Times,serif" font-size="14.00">appOwner: address</text>
+<text text-anchor="start" x="1847.45" y="-624.5" font-family="Times,serif" font-size="14.00">datasetorderHash: bytes32</text>
+<text text-anchor="start" x="1847.45" y="-607.7" font-family="Times,serif" font-size="14.00">datasetOwner: address</text>
+<text text-anchor="start" x="1847.45" y="-590.9" font-family="Times,serif" font-size="14.00">workerpoolorderHash: bytes32</text>
+<text text-anchor="start" x="1847.45" y="-574.1" font-family="Times,serif" font-size="14.00">workerpoolOwner: address</text>
+<text text-anchor="start" x="1847.45" y="-557.3" font-family="Times,serif" font-size="14.00">requestorderHash: bytes32</text>
+<text text-anchor="start" x="1847.45" y="-540.5" font-family="Times,serif" font-size="14.00">hasDataset: bool</text>
 </g>
 <!-- 11 -->
 <g id="node3" class="node">
 <title>11</title>
-<polygon fill="#f2f2f2" stroke="black" points="1648.58,-84.5 1648.58,-302.1 3044.64,-302.1 3044.64,-84.5 1648.58,-84.5"/>
-<text text-anchor="middle" x="2346.61" y="-285.5" font-family="Times,serif" font-size="14.00">IexecPoco1Facet</text>
-<text text-anchor="middle" x="2346.61" y="-268.7" font-family="Times,serif" font-size="14.00">contracts/facets/IexecPoco1Facet.sol</text>
-<polyline fill="none" stroke="black" points="1648.58,-260.5 3044.64,-260.5 "/>
-<text text-anchor="start" x="1656.58" y="-243.9" font-family="Times,serif" font-size="14.00">Private:</text>
-<text text-anchor="start" x="1656.58" y="-227.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_matchOrders(_apporder: IexecLibOrders_v5.AppOrder, _datasetorder: IexecLibOrders_v5.DatasetOrder, _workerpoolorder: IexecLibOrders_v5.WorkerpoolOrder, _requestorder: IexecLibOrders_v5.RequestOrder, _sponsor: address): bytes32</text>
-<text text-anchor="start" x="1656.58" y="-210.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_ignoreTeeFramework(tag: bytes32): bytes32</text>
-<text text-anchor="start" x="1656.58" y="-193.5" font-family="Times,serif" font-size="14.00">External:</text>
-<text text-anchor="start" x="1656.58" y="-176.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;verifySignature(_identity: address, _hash: bytes32, _signature: bytes): bool</text>
-<text text-anchor="start" x="1656.58" y="-159.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;verifyPresignature(_identity: address, _hash: bytes32): bool</text>
-<text text-anchor="start" x="1656.58" y="-143.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;verifyPresignatureOrSignature(_identity: address, _hash: bytes32, _signature: bytes): bool</text>
-<text text-anchor="start" x="1656.58" y="-126.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;assertDatasetDealCompatibility(datasetOrder: IexecLibOrders_v5.DatasetOrder, dealId: bytes32)</text>
-<text text-anchor="start" x="1656.58" y="-109.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;matchOrders(_apporder: IexecLibOrders_v5.AppOrder, _datasetorder: IexecLibOrders_v5.DatasetOrder, _workerpoolorder: IexecLibOrders_v5.WorkerpoolOrder, _requestorder: IexecLibOrders_v5.RequestOrder): bytes32</text>
-<text text-anchor="start" x="1656.58" y="-92.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;sponsorMatchOrders(_apporder: IexecLibOrders_v5.AppOrder, _datasetorder: IexecLibOrders_v5.DatasetOrder, _workerpoolorder: IexecLibOrders_v5.WorkerpoolOrder, _requestorder: IexecLibOrders_v5.RequestOrder): bytes32</text>
+<polygon fill="#f2f2f2" stroke="black" points="1094.62,-84.5 1094.62,-302.1 2490.68,-302.1 2490.68,-84.5 1094.62,-84.5"/>
+<text text-anchor="middle" x="1792.65" y="-285.5" font-family="Times,serif" font-size="14.00">IexecPoco1Facet</text>
+<text text-anchor="middle" x="1792.65" y="-268.7" font-family="Times,serif" font-size="14.00">contracts/facets/IexecPoco1Facet.sol</text>
+<polyline fill="none" stroke="black" points="1094.62,-260.5 2490.68,-260.5 "/>
+<text text-anchor="start" x="1102.62" y="-243.9" font-family="Times,serif" font-size="14.00">Private:</text>
+<text text-anchor="start" x="1102.62" y="-227.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_matchOrders(_apporder: IexecLibOrders_v5.AppOrder, _datasetorder: IexecLibOrders_v5.DatasetOrder, _workerpoolorder: IexecLibOrders_v5.WorkerpoolOrder, _requestorder: IexecLibOrders_v5.RequestOrder, _sponsor: address): bytes32</text>
+<text text-anchor="start" x="1102.62" y="-210.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_ignoreTeeFramework(tag: bytes32): bytes32</text>
+<text text-anchor="start" x="1102.62" y="-193.5" font-family="Times,serif" font-size="14.00">External:</text>
+<text text-anchor="start" x="1102.62" y="-176.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;verifySignature(_identity: address, _hash: bytes32, _signature: bytes): bool</text>
+<text text-anchor="start" x="1102.62" y="-159.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;verifyPresignature(_identity: address, _hash: bytes32): bool</text>
+<text text-anchor="start" x="1102.62" y="-143.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;verifyPresignatureOrSignature(_identity: address, _hash: bytes32, _signature: bytes): bool</text>
+<text text-anchor="start" x="1102.62" y="-126.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;assertDatasetDealCompatibility(datasetOrder: IexecLibOrders_v5.DatasetOrder, dealId: bytes32)</text>
+<text text-anchor="start" x="1102.62" y="-109.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;matchOrders(_apporder: IexecLibOrders_v5.AppOrder, _datasetorder: IexecLibOrders_v5.DatasetOrder, _workerpoolorder: IexecLibOrders_v5.WorkerpoolOrder, _requestorder: IexecLibOrders_v5.RequestOrder): bytes32</text>
+<text text-anchor="start" x="1102.62" y="-92.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;sponsorMatchOrders(_apporder: IexecLibOrders_v5.AppOrder, _datasetorder: IexecLibOrders_v5.DatasetOrder, _workerpoolorder: IexecLibOrders_v5.WorkerpoolOrder, _requestorder: IexecLibOrders_v5.RequestOrder): bytes32</text>
 </g>
 <!-- 11&#45;&gt;3 -->
 <g id="edge3" class="edge">
 <title>11&#45;&gt;3</title>
-<path fill="none" stroke="black" d="M3045,-222.16C3819.48,-257.56 4984.51,-325.9 5167.61,-422.6 5184.88,-431.72 5201.01,-443.44 5215.93,-456.68"/>
-<polygon fill="none" stroke="black" points="5208.79,-464.38 5237.61,-477.77 5223.43,-449.33 5208.79,-464.38"/>
+<path fill="none" stroke="black" d="M2490.91,-232.18C2899.92,-264.51 3370.39,-322.29 3549.65,-422.6 3566.32,-431.93 3581.99,-443.62 3596.53,-456.68"/>
+<polygon fill="none" stroke="black" points="3589.32,-464.31 3618.1,-477.8 3604.01,-449.31 3589.32,-464.31"/>
 </g>
 <!-- 11&#45;&gt;10 -->
 <g id="edge14" class="edge">
 <title>11&#45;&gt;10</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2409.59,-302.27C2431.75,-340.29 2456.81,-383.33 2479.61,-422.6 2498.57,-455.26 2519.16,-490.81 2537.89,-523.18"/>
-<polygon fill="black" stroke="black" points="2535.08,-525.31 2543.12,-532.22 2541.14,-521.81 2535.08,-525.31"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1831.61,-302.14C1855.82,-369.17 1886.85,-455.08 1911.17,-522.39"/>
+<polygon fill="black" stroke="black" points="1908.01,-523.96 1914.7,-532.18 1914.6,-521.58 1908.01,-523.96"/>
 </g>
 <!-- 26 -->
 <g id="node6" class="node">
 <title>26</title>
-<polygon fill="#f2f2f2" stroke="black" points="772.12,-507.1 772.12,-758.3 1763.1,-758.3 1763.1,-507.1 772.12,-507.1"/>
-<text text-anchor="middle" x="1267.61" y="-741.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
-<text text-anchor="middle" x="1267.61" y="-724.9" font-family="Times,serif" font-size="14.00">IexecPoco1</text>
-<text text-anchor="middle" x="1267.61" y="-708.1" font-family="Times,serif" font-size="14.00">contracts/interfaces/IexecPoco1.sol</text>
-<polyline fill="none" stroke="black" points="772.12,-699.9 1763.1,-699.9 "/>
-<text text-anchor="start" x="780.12" y="-683.3" font-family="Times,serif" font-size="14.00">External:</text>
-<text text-anchor="start" x="780.12" y="-666.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;verifySignature(address, bytes32, bytes): bool</text>
-<text text-anchor="start" x="780.12" y="-649.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;verifyPresignature(address, bytes32): bool</text>
-<text text-anchor="start" x="780.12" y="-632.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;verifyPresignatureOrSignature(address, bytes32, bytes): bool</text>
-<text text-anchor="start" x="780.12" y="-616.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;assertDatasetDealCompatibility(datasetOrder: IexecLibOrders_v5.DatasetOrder, dealId: bytes32)</text>
-<text text-anchor="start" x="780.12" y="-599.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;matchOrders(IexecLibOrders_v5.AppOrder, IexecLibOrders_v5.DatasetOrder, IexecLibOrders_v5.WorkerpoolOrder, IexecLibOrders_v5.RequestOrder): bytes32</text>
-<text text-anchor="start" x="780.12" y="-582.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;sponsorMatchOrders(IexecLibOrders_v5.AppOrder, IexecLibOrders_v5.DatasetOrder, IexecLibOrders_v5.WorkerpoolOrder, IexecLibOrders_v5.RequestOrder): bytes32</text>
-<text text-anchor="start" x="780.12" y="-565.7" font-family="Times,serif" font-size="14.00">Public:</text>
-<text text-anchor="start" x="780.12" y="-548.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; SchedulerNotice(workerpool: address, dealid: bytes32)</text>
-<text text-anchor="start" x="780.12" y="-532.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; OrdersMatched(dealid: bytes32, appHash: bytes32, datasetHash: bytes32, workerpoolHash: bytes32, requestHash: bytes32, volume: uint256)</text>
-<text text-anchor="start" x="780.12" y="-515.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; DealSponsored(dealId: bytes32, sponsor: address)</text>
+<polygon fill="#f2f2f2" stroke="black" points="123.16,-507.1 123.16,-758.3 1114.14,-758.3 1114.14,-507.1 123.16,-507.1"/>
+<text text-anchor="middle" x="618.65" y="-741.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
+<text text-anchor="middle" x="618.65" y="-724.9" font-family="Times,serif" font-size="14.00">IexecPoco1</text>
+<text text-anchor="middle" x="618.65" y="-708.1" font-family="Times,serif" font-size="14.00">contracts/interfaces/IexecPoco1.sol</text>
+<polyline fill="none" stroke="black" points="123.16,-699.9 1114.14,-699.9 "/>
+<text text-anchor="start" x="131.16" y="-683.3" font-family="Times,serif" font-size="14.00">External:</text>
+<text text-anchor="start" x="131.16" y="-666.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;verifySignature(address, bytes32, bytes): bool</text>
+<text text-anchor="start" x="131.16" y="-649.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;verifyPresignature(address, bytes32): bool</text>
+<text text-anchor="start" x="131.16" y="-632.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;verifyPresignatureOrSignature(address, bytes32, bytes): bool</text>
+<text text-anchor="start" x="131.16" y="-616.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;assertDatasetDealCompatibility(datasetOrder: IexecLibOrders_v5.DatasetOrder, dealId: bytes32)</text>
+<text text-anchor="start" x="131.16" y="-599.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;matchOrders(IexecLibOrders_v5.AppOrder, IexecLibOrders_v5.DatasetOrder, IexecLibOrders_v5.WorkerpoolOrder, IexecLibOrders_v5.RequestOrder): bytes32</text>
+<text text-anchor="start" x="131.16" y="-582.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;sponsorMatchOrders(IexecLibOrders_v5.AppOrder, IexecLibOrders_v5.DatasetOrder, IexecLibOrders_v5.WorkerpoolOrder, IexecLibOrders_v5.RequestOrder): bytes32</text>
+<text text-anchor="start" x="131.16" y="-565.7" font-family="Times,serif" font-size="14.00">Public:</text>
+<text text-anchor="start" x="131.16" y="-548.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; SchedulerNotice(workerpool: address, dealid: bytes32)</text>
+<text text-anchor="start" x="131.16" y="-532.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; OrdersMatched(dealid: bytes32, appHash: bytes32, datasetHash: bytes32, workerpoolHash: bytes32, requestHash: bytes32, volume: uint256)</text>
+<text text-anchor="start" x="131.16" y="-515.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; DealSponsored(dealId: bytes32, sponsor: address)</text>
 </g>
 <!-- 11&#45;&gt;26 -->
 <g id="edge1" class="edge">
 <title>11&#45;&gt;26</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2076.04,-302.1C1981.26,-340.02 1874.16,-383.03 1776.61,-422.6 1718.81,-446.05 1657.39,-471.13 1597.95,-495.5"/>
-<polygon fill="none" stroke="black" points="1593.66,-485.91 1569.89,-507.01 1601.63,-505.34 1593.66,-485.91"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1466.15,-302.1C1357.93,-338.97 1237.17,-381.35 1127.65,-422.6 1067.28,-445.34 1003.34,-470.64 941.91,-495.55"/>
+<polygon fill="none" stroke="black" points="937.71,-485.93 913.89,-506.97 945.63,-505.38 937.71,-485.93"/>
 </g>
 <!-- 27 -->
 <g id="node7" class="node">
 <title>27</title>
-<polygon fill="#f2f2f2" stroke="black" points="2222.19,-603.5 2222.19,-661.9 2471.03,-661.9 2471.03,-603.5 2222.19,-603.5"/>
-<text text-anchor="middle" x="2346.61" y="-645.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
-<text text-anchor="middle" x="2346.61" y="-628.5" font-family="Times,serif" font-size="14.00">IexecPoco1Errors</text>
-<text text-anchor="middle" x="2346.61" y="-611.7" font-family="Times,serif" font-size="14.00">contracts/interfaces/IexecPoco1Errors.sol</text>
+<polygon fill="#f2f2f2" stroke="black" points="1497.23,-603.5 1497.23,-661.9 1746.08,-661.9 1746.08,-603.5 1497.23,-603.5"/>
+<text text-anchor="middle" x="1621.65" y="-645.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
+<text text-anchor="middle" x="1621.65" y="-628.5" font-family="Times,serif" font-size="14.00">IexecPoco1Errors</text>
+<text text-anchor="middle" x="1621.65" y="-611.7" font-family="Times,serif" font-size="14.00">contracts/interfaces/IexecPoco1Errors.sol</text>
 </g>
 <!-- 11&#45;&gt;27 -->
 <g id="edge2" class="edge">
 <title>11&#45;&gt;27</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2346.61,-302.14C2346.61,-387.6 2346.61,-503.76 2346.61,-572.9"/>
-<polygon fill="none" stroke="black" points="2336.11,-573.14 2346.61,-603.14 2357.11,-573.14 2336.11,-573.14"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1750.49,-302.14C1716.78,-388.38 1670.84,-505.88 1643.91,-574.78"/>
+<polygon fill="none" stroke="black" points="1633.96,-571.37 1632.82,-603.14 1653.52,-579.02 1633.96,-571.37"/>
 </g>
 <!-- 34 -->
 <g id="node9" class="node">
 <title>34</title>
-<polygon fill="#f2f2f2" stroke="black" points="2729.53,-511.5 2729.53,-753.9 4625.69,-753.9 4625.69,-511.5 2729.53,-511.5"/>
-<text text-anchor="middle" x="3677.61" y="-737.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
-<text text-anchor="middle" x="3677.61" y="-720.5" font-family="Times,serif" font-size="14.00">CommonLib</text>
-<text text-anchor="middle" x="3677.61" y="-703.7" font-family="Times,serif" font-size="14.00">contracts/libs/CommonLib.sol</text>
-<polyline fill="none" stroke="black" points="2729.53,-695.5 4625.69,-695.5 "/>
-<text text-anchor="start" x="2737.53" y="-678.9" font-family="Times,serif" font-size="14.00">Private:</text>
-<text text-anchor="start" x="2737.53" y="-662.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;GROUPMEMBER_PURPOSE: uint256</text>
-<polyline fill="none" stroke="black" points="2729.53,-653.9 4625.69,-653.9 "/>
-<text text-anchor="start" x="2737.53" y="-637.3" font-family="Times,serif" font-size="14.00">Internal:</text>
-<text text-anchor="start" x="2737.53" y="-620.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;toTypedDataHash(structHash: bytes32): bytes32</text>
-<text text-anchor="start" x="2737.53" y="-603.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;verifySignatureOfEthSignedMessage(account: address, message: bytes, signature: bytes): bool</text>
-<text text-anchor="start" x="2737.53" y="-586.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;verifySignature(account: address, messageHash: bytes32, signature: bytes): bool</text>
-<text text-anchor="start" x="2737.53" y="-570.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;verifyPresignature(account: address, messageHash: bytes32): bool</text>
-<text text-anchor="start" x="2737.53" y="-553.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;verifySignatureOrPresignature(account: address, messageHash: bytes32, signature: bytes): bool</text>
-<text text-anchor="start" x="2737.53" y="-536.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;isAccountAuthorizedByRestriction(restriction: address, account: address): bool</text>
-<text text-anchor="start" x="2737.53" y="-519.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;computeDealVolume(appOrderVolume: uint256, appOrderTypedDataHash: bytes32, hasDataset: bool, datasetOrderVolume: uint256, datasetOrderTypedDataHash: bytes32, workerpoolOrderVolume: uint256, workerpoolOrderTypedDataHash: bytes32, requestOrderVolume: uint256, requestOrderTypedDataHash: bytes32): uint256</text>
+<polygon fill="#f2f2f2" stroke="black" points="1877.57,-963.3 1877.57,-1205.7 3773.73,-1205.7 3773.73,-963.3 1877.57,-963.3"/>
+<text text-anchor="middle" x="2825.65" y="-1189.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
+<text text-anchor="middle" x="2825.65" y="-1172.3" font-family="Times,serif" font-size="14.00">CommonLib</text>
+<text text-anchor="middle" x="2825.65" y="-1155.5" font-family="Times,serif" font-size="14.00">contracts/libs/CommonLib.sol</text>
+<polyline fill="none" stroke="black" points="1877.57,-1147.3 3773.73,-1147.3 "/>
+<text text-anchor="start" x="1885.57" y="-1130.7" font-family="Times,serif" font-size="14.00">Private:</text>
+<text text-anchor="start" x="1885.57" y="-1113.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;GROUPMEMBER_PURPOSE: uint256</text>
+<polyline fill="none" stroke="black" points="1877.57,-1105.7 3773.73,-1105.7 "/>
+<text text-anchor="start" x="1885.57" y="-1089.1" font-family="Times,serif" font-size="14.00">Internal:</text>
+<text text-anchor="start" x="1885.57" y="-1072.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;toTypedDataHash(structHash: bytes32): bytes32</text>
+<text text-anchor="start" x="1885.57" y="-1055.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;verifySignatureOfEthSignedMessage(account: address, message: bytes, signature: bytes): bool</text>
+<text text-anchor="start" x="1885.57" y="-1038.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;verifySignature(account: address, messageHash: bytes32, signature: bytes): bool</text>
+<text text-anchor="start" x="1885.57" y="-1021.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;verifyPresignature(account: address, messageHash: bytes32): bool</text>
+<text text-anchor="start" x="1885.57" y="-1005.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;verifySignatureOrPresignature(account: address, messageHash: bytes32, signature: bytes): bool</text>
+<text text-anchor="start" x="1885.57" y="-988.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;isAccountAuthorizedByRestriction(restriction: address, account: address): bool</text>
+<text text-anchor="start" x="1885.57" y="-971.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;computeDealVolume(appOrderVolume: uint256, appOrderTypedDataHash: bytes32, hasDataset: bool, datasetOrderVolume: uint256, datasetOrderTypedDataHash: bytes32, workerpoolOrderVolume: uint256, workerpoolOrderTypedDataHash: bytes32, requestOrderVolume: uint256, requestOrderTypedDataHash: bytes32): uint256</text>
 </g>
 <!-- 11&#45;&gt;34 -->
 <g id="edge5" class="edge">
 <title>11&#45;&gt;34</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2674.77,-302.14C2864.77,-364.58 3104.65,-443.41 3302.16,-508.32"/>
-<polygon fill="black" stroke="black" points="3301.23,-511.7 3311.83,-511.49 3303.42,-505.05 3301.23,-511.7"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1946.61,-302.27C1997.5,-339.28 2053.82,-381.7 2103.65,-422.6 2318.36,-598.81 2553.22,-819.43 2694.97,-955.91"/>
+<polygon fill="black" stroke="black" points="2692.86,-958.74 2702.49,-963.16 2697.72,-953.7 2692.86,-958.74"/>
 </g>
 <!-- 35 -->
 <g id="node10" class="node">
 <title>35</title>
-<polygon fill="#f2f2f2" stroke="black" points="4681.98,-490.3 4681.98,-775.1 5087.24,-775.1 5087.24,-490.3 4681.98,-490.3"/>
-<text text-anchor="middle" x="4884.61" y="-758.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
-<text text-anchor="middle" x="4884.61" y="-741.7" font-family="Times,serif" font-size="14.00">EscrowLib</text>
-<text text-anchor="middle" x="4884.61" y="-724.9" font-family="Times,serif" font-size="14.00">contracts/libs/EscrowLib.sol</text>
-<polyline fill="none" stroke="black" points="4681.98,-716.7 5087.24,-716.7 "/>
-<text text-anchor="start" x="4689.98" y="-700.1" font-family="Times,serif" font-size="14.00">Internal:</text>
-<text text-anchor="start" x="4689.98" y="-683.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;lock(account: address, value: uint256)</text>
-<text text-anchor="start" x="4689.98" y="-666.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;unlock(account: address, value: uint256)</text>
-<text text-anchor="start" x="4689.98" y="-649.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;reward(account: address, value: uint256, ref: bytes32)</text>
-<text text-anchor="start" x="4689.98" y="-632.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;seize(account: address, value: uint256, ref: bytes32)</text>
-<text text-anchor="start" x="4689.98" y="-616.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;rewardAndLock(account: address, value: uint256, ref: bytes32)</text>
-<text text-anchor="start" x="4689.98" y="-599.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;transfer(from: address, to: address, value: uint256)</text>
-<text text-anchor="start" x="4689.98" y="-582.5" font-family="Times,serif" font-size="14.00">Public:</text>
-<text text-anchor="start" x="4689.98" y="-565.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Transfer(from: address, to: address, value: uint256)</text>
-<text text-anchor="start" x="4689.98" y="-548.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Reward(owner: address, amount: uint256, ref: bytes32)</text>
-<text text-anchor="start" x="4689.98" y="-532.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Seize(owner: address, amount: uint256, ref: bytes32)</text>
-<text text-anchor="start" x="4689.98" y="-515.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Lock(owner: address, amount: uint256)</text>
-<text text-anchor="start" x="4689.98" y="-498.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Unlock(owner: address, amount: uint256)</text>
+<polygon fill="#f2f2f2" stroke="black" points="3930.02,-507.1 3930.02,-758.3 4335.29,-758.3 4335.29,-507.1 3930.02,-507.1"/>
+<text text-anchor="middle" x="4132.65" y="-741.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
+<text text-anchor="middle" x="4132.65" y="-724.9" font-family="Times,serif" font-size="14.00">EscrowLib</text>
+<text text-anchor="middle" x="4132.65" y="-708.1" font-family="Times,serif" font-size="14.00">contracts/libs/EscrowLib.sol</text>
+<polyline fill="none" stroke="black" points="3930.02,-699.9 4335.29,-699.9 "/>
+<text text-anchor="start" x="3938.02" y="-683.3" font-family="Times,serif" font-size="14.00">Internal:</text>
+<text text-anchor="start" x="3938.02" y="-666.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;lock(account: address, value: uint256)</text>
+<text text-anchor="start" x="3938.02" y="-649.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;unlock(account: address, value: uint256)</text>
+<text text-anchor="start" x="3938.02" y="-632.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;reward(account: address, value: uint256, ref: bytes32)</text>
+<text text-anchor="start" x="3938.02" y="-616.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;seize(account: address, value: uint256, ref: bytes32)</text>
+<text text-anchor="start" x="3938.02" y="-599.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;rewardAndLock(account: address, value: uint256, ref: bytes32)</text>
+<text text-anchor="start" x="3938.02" y="-582.5" font-family="Times,serif" font-size="14.00">Public:</text>
+<text text-anchor="start" x="3938.02" y="-565.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Reward(owner: address, amount: uint256, ref: bytes32)</text>
+<text text-anchor="start" x="3938.02" y="-548.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Seize(owner: address, amount: uint256, ref: bytes32)</text>
+<text text-anchor="start" x="3938.02" y="-532.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Lock(owner: address, amount: uint256)</text>
+<text text-anchor="start" x="3938.02" y="-515.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Unlock(owner: address, amount: uint256)</text>
 </g>
 <!-- 11&#45;&gt;35 -->
 <g id="edge16" class="edge">
 <title>11&#45;&gt;35</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3044.79,-212.81C3621.1,-237.24 4387.99,-293.53 4667.61,-422.6 4699.96,-437.53 4730.45,-459.31 4757.79,-483.25"/>
-<polygon fill="black" stroke="black" points="4755.62,-486.01 4765.41,-490.05 4760.28,-480.78 4755.62,-486.01"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2490.75,-227.19C2998.82,-259.22 3638.77,-318.72 3882.65,-422.6 3926.27,-441.18 3968.12,-470 4004.68,-500.36"/>
+<polygon fill="black" stroke="black" points="4002.5,-503.1 4012.4,-506.86 4007.01,-497.74 4002.5,-503.1"/>
 </g>
 <!-- 36 -->
 <g id="node11" class="node">
 <title>36</title>
-<polygon fill="#f2f2f2" stroke="black" points="5449.44,-1988.5 5449.44,-2046.9 5661.78,-2046.9 5661.78,-1988.5 5449.44,-1988.5"/>
-<text text-anchor="middle" x="5555.61" y="-2030.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
-<text text-anchor="middle" x="5555.61" y="-2013.5" font-family="Times,serif" font-size="14.00">IexecLibCore_v5</text>
-<text text-anchor="middle" x="5555.61" y="-1996.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polygon fill="#f2f2f2" stroke="black" points="5275.49,-2243.1 5275.49,-2301.5 5487.82,-2301.5 5487.82,-2243.1 5275.49,-2243.1"/>
+<text text-anchor="middle" x="5381.65" y="-2284.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
+<text text-anchor="middle" x="5381.65" y="-2268.1" font-family="Times,serif" font-size="14.00">IexecLibCore_v5</text>
+<text text-anchor="middle" x="5381.65" y="-2251.3" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
 </g>
 <!-- 11&#45;&gt;36 -->
 <g id="edge9" class="edge">
 <title>11&#45;&gt;36</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3044.76,-204.76C3812.97,-223.59 4958.08,-276.16 5096.61,-422.6 5149.73,-478.76 5092.61,-1748.7 5134.61,-1813.6 5202.23,-1918.11 5339.97,-1970.29 5439.52,-1995.34"/>
-<polygon fill="black" stroke="black" points="5438.78,-1998.76 5449.33,-1997.75 5440.45,-1991.97 5438.78,-1998.76"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2491.02,-255.48C3245.13,-321.73 4340.42,-418.59 4344.65,-422.6 4452.34,-524.67 4439.65,-935.12 4439.65,-1083.5 4439.65,-1083.5 4439.65,-1083.5 4439.65,-1495.3 4439.65,-1823.7 4444.45,-1982.88 4702.65,-2185.8 4787.61,-2252.56 5094.57,-2267.62 5265.21,-2270.74"/>
+<polygon fill="black" stroke="black" points="5265.18,-2274.24 5275.24,-2270.91 5265.3,-2267.24 5265.18,-2274.24"/>
 </g>
 <!-- 43 -->
 <g id="node13" class="node">
 <title>43</title>
-<polygon fill="#f2f2f2" stroke="black" points="5258.44,-916.9 5258.44,-1252.1 5470.78,-1252.1 5470.78,-916.9 5258.44,-916.9"/>
-<text text-anchor="middle" x="5364.61" y="-1235.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="5364.61" y="-1218.7" font-family="Times,serif" font-size="14.00">Deal</text>
-<text text-anchor="middle" x="5364.61" y="-1201.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
-<polyline fill="none" stroke="black" points="5258.44,-1193.7 5470.78,-1193.7 "/>
-<text text-anchor="start" x="5266.44" y="-1177.1" font-family="Times,serif" font-size="14.00">app: Resource</text>
-<text text-anchor="start" x="5266.44" y="-1160.3" font-family="Times,serif" font-size="14.00">dataset: Resource</text>
-<text text-anchor="start" x="5266.44" y="-1143.5" font-family="Times,serif" font-size="14.00">workerpool: Resource</text>
-<text text-anchor="start" x="5266.44" y="-1126.7" font-family="Times,serif" font-size="14.00">trust: uint256</text>
-<text text-anchor="start" x="5266.44" y="-1109.9" font-family="Times,serif" font-size="14.00">category: uint256</text>
-<text text-anchor="start" x="5266.44" y="-1093.1" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
-<text text-anchor="start" x="5266.44" y="-1076.3" font-family="Times,serif" font-size="14.00">requester: address</text>
-<text text-anchor="start" x="5266.44" y="-1059.5" font-family="Times,serif" font-size="14.00">beneficiary: address</text>
-<text text-anchor="start" x="5266.44" y="-1042.7" font-family="Times,serif" font-size="14.00">callback: address</text>
-<text text-anchor="start" x="5266.44" y="-1025.9" font-family="Times,serif" font-size="14.00">params: string</text>
-<text text-anchor="start" x="5266.44" y="-1009.1" font-family="Times,serif" font-size="14.00">startTime: uint256</text>
-<text text-anchor="start" x="5266.44" y="-992.3" font-family="Times,serif" font-size="14.00">botFirst: uint256</text>
-<text text-anchor="start" x="5266.44" y="-975.5" font-family="Times,serif" font-size="14.00">botSize: uint256</text>
-<text text-anchor="start" x="5266.44" y="-958.7" font-family="Times,serif" font-size="14.00">workerStake: uint256</text>
-<text text-anchor="start" x="5266.44" y="-941.9" font-family="Times,serif" font-size="14.00">schedulerRewardRatio: uint256</text>
-<text text-anchor="start" x="5266.44" y="-925.1" font-family="Times,serif" font-size="14.00">sponsor: address</text>
+<polygon fill="#f2f2f2" stroke="black" points="4677.49,-1326.7 4677.49,-1661.9 4889.82,-1661.9 4889.82,-1326.7 4677.49,-1326.7"/>
+<text text-anchor="middle" x="4783.65" y="-1645.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="4783.65" y="-1628.5" font-family="Times,serif" font-size="14.00">Deal</text>
+<text text-anchor="middle" x="4783.65" y="-1611.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polyline fill="none" stroke="black" points="4677.49,-1603.5 4889.82,-1603.5 "/>
+<text text-anchor="start" x="4685.49" y="-1586.9" font-family="Times,serif" font-size="14.00">app: Resource</text>
+<text text-anchor="start" x="4685.49" y="-1570.1" font-family="Times,serif" font-size="14.00">dataset: Resource</text>
+<text text-anchor="start" x="4685.49" y="-1553.3" font-family="Times,serif" font-size="14.00">workerpool: Resource</text>
+<text text-anchor="start" x="4685.49" y="-1536.5" font-family="Times,serif" font-size="14.00">trust: uint256</text>
+<text text-anchor="start" x="4685.49" y="-1519.7" font-family="Times,serif" font-size="14.00">category: uint256</text>
+<text text-anchor="start" x="4685.49" y="-1502.9" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
+<text text-anchor="start" x="4685.49" y="-1486.1" font-family="Times,serif" font-size="14.00">requester: address</text>
+<text text-anchor="start" x="4685.49" y="-1469.3" font-family="Times,serif" font-size="14.00">beneficiary: address</text>
+<text text-anchor="start" x="4685.49" y="-1452.5" font-family="Times,serif" font-size="14.00">callback: address</text>
+<text text-anchor="start" x="4685.49" y="-1435.7" font-family="Times,serif" font-size="14.00">params: string</text>
+<text text-anchor="start" x="4685.49" y="-1418.9" font-family="Times,serif" font-size="14.00">startTime: uint256</text>
+<text text-anchor="start" x="4685.49" y="-1402.1" font-family="Times,serif" font-size="14.00">botFirst: uint256</text>
+<text text-anchor="start" x="4685.49" y="-1385.3" font-family="Times,serif" font-size="14.00">botSize: uint256</text>
+<text text-anchor="start" x="4685.49" y="-1368.5" font-family="Times,serif" font-size="14.00">workerStake: uint256</text>
+<text text-anchor="start" x="4685.49" y="-1351.7" font-family="Times,serif" font-size="14.00">schedulerRewardRatio: uint256</text>
+<text text-anchor="start" x="4685.49" y="-1334.9" font-family="Times,serif" font-size="14.00">sponsor: address</text>
 </g>
 <!-- 11&#45;&gt;43 -->
 <g id="edge10" class="edge">
 <title>11&#45;&gt;43</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3044.97,-229.44C3844.96,-272.97 5055.79,-350.25 5129.61,-422.6 5196.65,-488.3 5137.13,-755.9 5172.61,-842.8 5191.14,-888.19 5221.05,-931.96 5251.79,-969.44"/>
-<polygon fill="black" stroke="black" points="5249.27,-971.88 5258.36,-977.34 5254.66,-967.41 5249.27,-971.88"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2490.91,-257.57C2921.2,-296.07 3484.28,-345.56 3983.65,-386.6 4035.85,-390.89 4416.23,-385.96 4453.65,-422.6 4470.96,-439.54 4527.3,-1268.81 4538.65,-1290.2 4568.29,-1346.01 4620.36,-1392.5 4668.89,-1426.85"/>
+<polygon fill="black" stroke="black" points="4667.06,-1429.84 4677.27,-1432.69 4671.07,-1424.1 4667.06,-1429.84"/>
 </g>
 <!-- 50 -->
 <g id="node19" class="node">
 <title>50</title>
-<polygon fill="#f2f2f2" stroke="black" points="762.84,-879.3 762.84,-1289.7 1196.38,-1289.7 1196.38,-879.3 762.84,-879.3"/>
-<text text-anchor="middle" x="979.61" y="-1273.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
-<text text-anchor="middle" x="979.61" y="-1256.3" font-family="Times,serif" font-size="14.00">IexecLibOrders_v5</text>
-<text text-anchor="middle" x="979.61" y="-1239.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="762.84,-1231.3 1196.38,-1231.3 "/>
-<text text-anchor="start" x="770.84" y="-1214.7" font-family="Times,serif" font-size="14.00">Public:</text>
-<text text-anchor="start" x="770.84" y="-1197.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;EIP712DOMAIN_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="770.84" y="-1181.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;APPORDER_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="770.84" y="-1164.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;DATASETORDER_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="770.84" y="-1147.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;WORKERPOOLORDER_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="770.84" y="-1130.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;REQUESTORDER_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="770.84" y="-1113.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;APPORDEROPERATION_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="770.84" y="-1097.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;DATASETORDEROPERATION_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="770.84" y="-1080.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;WORKERPOOLORDEROPERATION_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="770.84" y="-1063.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;REQUESTORDEROPERATION_TYPEHASH: bytes32</text>
-<polyline fill="none" stroke="black" points="762.84,-1055.3 1196.38,-1055.3 "/>
-<text text-anchor="start" x="770.84" y="-1038.7" font-family="Times,serif" font-size="14.00">Public:</text>
-<text text-anchor="start" x="770.84" y="-1021.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_domain: EIP712Domain): (domainhash: bytes32)</text>
-<text text-anchor="start" x="770.84" y="-1005.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_apporder: AppOrder): (apphash: bytes32)</text>
-<text text-anchor="start" x="770.84" y="-988.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_datasetorder: DatasetOrder): (datasethash: bytes32)</text>
-<text text-anchor="start" x="770.84" y="-971.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_workerpoolorder: WorkerpoolOrder): (workerpoolhash: bytes32)</text>
-<text text-anchor="start" x="770.84" y="-954.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_requestorder: RequestOrder): (requesthash: bytes32)</text>
-<text text-anchor="start" x="770.84" y="-937.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_apporderoperation: AppOrderOperation): bytes32</text>
-<text text-anchor="start" x="770.84" y="-921.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_datasetorderoperation: DatasetOrderOperation): bytes32</text>
-<text text-anchor="start" x="770.84" y="-904.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_workerpoolorderoperation: WorkerpoolOrderOperation): bytes32</text>
-<text text-anchor="start" x="770.84" y="-887.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_requestorderoperation: RequestOrderOperation): bytes32</text>
+<polygon fill="#f2f2f2" stroke="black" points="694.89,-879.3 694.89,-1289.7 1128.42,-1289.7 1128.42,-879.3 694.89,-879.3"/>
+<text text-anchor="middle" x="911.65" y="-1273.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
+<text text-anchor="middle" x="911.65" y="-1256.3" font-family="Times,serif" font-size="14.00">IexecLibOrders_v5</text>
+<text text-anchor="middle" x="911.65" y="-1239.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="694.89,-1231.3 1128.42,-1231.3 "/>
+<text text-anchor="start" x="702.89" y="-1214.7" font-family="Times,serif" font-size="14.00">Public:</text>
+<text text-anchor="start" x="702.89" y="-1197.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;EIP712DOMAIN_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="702.89" y="-1181.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;APPORDER_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="702.89" y="-1164.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;DATASETORDER_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="702.89" y="-1147.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;WORKERPOOLORDER_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="702.89" y="-1130.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;REQUESTORDER_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="702.89" y="-1113.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;APPORDEROPERATION_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="702.89" y="-1097.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;DATASETORDEROPERATION_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="702.89" y="-1080.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;WORKERPOOLORDEROPERATION_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="702.89" y="-1063.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;REQUESTORDEROPERATION_TYPEHASH: bytes32</text>
+<polyline fill="none" stroke="black" points="694.89,-1055.3 1128.42,-1055.3 "/>
+<text text-anchor="start" x="702.89" y="-1038.7" font-family="Times,serif" font-size="14.00">Public:</text>
+<text text-anchor="start" x="702.89" y="-1021.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_domain: EIP712Domain): (domainhash: bytes32)</text>
+<text text-anchor="start" x="702.89" y="-1005.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_apporder: AppOrder): (apphash: bytes32)</text>
+<text text-anchor="start" x="702.89" y="-988.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_datasetorder: DatasetOrder): (datasethash: bytes32)</text>
+<text text-anchor="start" x="702.89" y="-971.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_workerpoolorder: WorkerpoolOrder): (workerpoolhash: bytes32)</text>
+<text text-anchor="start" x="702.89" y="-954.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_requestorder: RequestOrder): (requesthash: bytes32)</text>
+<text text-anchor="start" x="702.89" y="-937.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_apporderoperation: AppOrderOperation): bytes32</text>
+<text text-anchor="start" x="702.89" y="-921.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_datasetorderoperation: DatasetOrderOperation): bytes32</text>
+<text text-anchor="start" x="702.89" y="-904.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_workerpoolorderoperation: WorkerpoolOrderOperation): bytes32</text>
+<text text-anchor="start" x="702.89" y="-887.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_requestorderoperation: RequestOrderOperation): bytes32</text>
 </g>
 <!-- 11&#45;&gt;50 -->
 <g id="edge4" class="edge">
 <title>11&#45;&gt;50</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1648.33,-252.92C1252.57,-293.42 824.31,-352.52 763.61,-422.6 641.34,-563.77 696.83,-668.39 763.61,-842.8 767.15,-852.04 771.22,-861.15 775.74,-870.1"/>
-<polygon fill="black" stroke="black" points="772.67,-871.77 780.41,-879 778.87,-868.52 772.67,-871.77"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1306.96,-302.19C1250.67,-332.83 1199.58,-372.15 1160.65,-422.6 1103.38,-496.83 1159.59,-756.62 1122.65,-842.8 1118.71,-851.99 1114.28,-861.08 1109.45,-870.04"/>
+<polygon fill="black" stroke="black" points="1106.3,-868.51 1104.49,-878.95 1112.41,-871.92 1106.3,-868.51"/>
 </g>
 <!-- 53 -->
 <g id="node22" class="node">
 <title>53</title>
-<polygon fill="#f2f2f2" stroke="black" points="1258,-1908.9 1258,-2126.5 1481.22,-2126.5 1481.22,-1908.9 1258,-1908.9"/>
-<text text-anchor="middle" x="1369.61" y="-2109.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="1369.61" y="-2093.1" font-family="Times,serif" font-size="14.00">AppOrder</text>
-<text text-anchor="middle" x="1369.61" y="-2076.3" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="1258,-2068.1 1481.22,-2068.1 "/>
-<text text-anchor="start" x="1266" y="-2051.5" font-family="Times,serif" font-size="14.00">app: address</text>
-<text text-anchor="start" x="1266" y="-2034.7" font-family="Times,serif" font-size="14.00">appprice: uint256</text>
-<text text-anchor="start" x="1266" y="-2017.9" font-family="Times,serif" font-size="14.00">volume: uint256</text>
-<text text-anchor="start" x="1266" y="-2001.1" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
-<text text-anchor="start" x="1266" y="-1984.3" font-family="Times,serif" font-size="14.00">datasetrestrict: address</text>
-<text text-anchor="start" x="1266" y="-1967.5" font-family="Times,serif" font-size="14.00">workerpoolrestrict: address</text>
-<text text-anchor="start" x="1266" y="-1950.7" font-family="Times,serif" font-size="14.00">requesterrestrict: address</text>
-<text text-anchor="start" x="1266" y="-1933.9" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
-<text text-anchor="start" x="1266" y="-1917.1" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+<polygon fill="#f2f2f2" stroke="black" points="410.04,-1833.3 410.04,-2050.9 633.26,-2050.9 633.26,-1833.3 410.04,-1833.3"/>
+<text text-anchor="middle" x="521.65" y="-2034.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="521.65" y="-2017.5" font-family="Times,serif" font-size="14.00">AppOrder</text>
+<text text-anchor="middle" x="521.65" y="-2000.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="410.04,-1992.5 633.26,-1992.5 "/>
+<text text-anchor="start" x="418.04" y="-1975.9" font-family="Times,serif" font-size="14.00">app: address</text>
+<text text-anchor="start" x="418.04" y="-1959.1" font-family="Times,serif" font-size="14.00">appprice: uint256</text>
+<text text-anchor="start" x="418.04" y="-1942.3" font-family="Times,serif" font-size="14.00">volume: uint256</text>
+<text text-anchor="start" x="418.04" y="-1925.5" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
+<text text-anchor="start" x="418.04" y="-1908.7" font-family="Times,serif" font-size="14.00">datasetrestrict: address</text>
+<text text-anchor="start" x="418.04" y="-1891.9" font-family="Times,serif" font-size="14.00">workerpoolrestrict: address</text>
+<text text-anchor="start" x="418.04" y="-1875.1" font-family="Times,serif" font-size="14.00">requesterrestrict: address</text>
+<text text-anchor="start" x="418.04" y="-1858.3" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
+<text text-anchor="start" x="418.04" y="-1841.5" font-family="Times,serif" font-size="14.00">sign: bytes</text>
 </g>
 <!-- 11&#45;&gt;53 -->
 <g id="edge11" class="edge">
 <title>11&#45;&gt;53</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1945.38,-302.18C1890.71,-332.86 1840.99,-372.2 1804.61,-422.6 1777.2,-460.57 1775.91,-796.17 1771.61,-842.8 1761.64,-950.81 1724.37,-1720.56 1668.61,-1813.6 1662.86,-1823.19 1570.8,-1885.08 1490.33,-1938.05"/>
-<polygon fill="black" stroke="black" points="1488.02,-1935.38 1481.59,-1943.8 1491.86,-1941.23 1488.02,-1935.38"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1094.59,-246.37C663.98,-285.8 181.38,-346.18 114.65,-422.6 38.33,-510 128.61,-1563.59 206.65,-1662.4 235.93,-1699.47 267.55,-1671.9 306.65,-1698.4 356.76,-1732.37 402.71,-1780.63 439.16,-1825.17"/>
+<polygon fill="black" stroke="black" points="436.6,-1827.58 445.62,-1833.16 442.04,-1823.18 436.6,-1827.58"/>
 </g>
 <!-- 54 -->
 <g id="node23" class="node">
 <title>54</title>
-<polygon fill="#f2f2f2" stroke="black" points="1632,-1908.9 1632,-2126.5 1855.22,-2126.5 1855.22,-1908.9 1632,-1908.9"/>
-<text text-anchor="middle" x="1743.61" y="-2109.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="1743.61" y="-2093.1" font-family="Times,serif" font-size="14.00">DatasetOrder</text>
-<text text-anchor="middle" x="1743.61" y="-2076.3" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="1632,-2068.1 1855.22,-2068.1 "/>
-<text text-anchor="start" x="1640" y="-2051.5" font-family="Times,serif" font-size="14.00">dataset: address</text>
-<text text-anchor="start" x="1640" y="-2034.7" font-family="Times,serif" font-size="14.00">datasetprice: uint256</text>
-<text text-anchor="start" x="1640" y="-2017.9" font-family="Times,serif" font-size="14.00">volume: uint256</text>
-<text text-anchor="start" x="1640" y="-2001.1" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
-<text text-anchor="start" x="1640" y="-1984.3" font-family="Times,serif" font-size="14.00">apprestrict: address</text>
-<text text-anchor="start" x="1640" y="-1967.5" font-family="Times,serif" font-size="14.00">workerpoolrestrict: address</text>
-<text text-anchor="start" x="1640" y="-1950.7" font-family="Times,serif" font-size="14.00">requesterrestrict: address</text>
-<text text-anchor="start" x="1640" y="-1933.9" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
-<text text-anchor="start" x="1640" y="-1917.1" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+<polygon fill="#f2f2f2" stroke="black" points="1438.04,-1833.3 1438.04,-2050.9 1661.26,-2050.9 1661.26,-1833.3 1438.04,-1833.3"/>
+<text text-anchor="middle" x="1549.65" y="-2034.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="1549.65" y="-2017.5" font-family="Times,serif" font-size="14.00">DatasetOrder</text>
+<text text-anchor="middle" x="1549.65" y="-2000.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="1438.04,-1992.5 1661.26,-1992.5 "/>
+<text text-anchor="start" x="1446.04" y="-1975.9" font-family="Times,serif" font-size="14.00">dataset: address</text>
+<text text-anchor="start" x="1446.04" y="-1959.1" font-family="Times,serif" font-size="14.00">datasetprice: uint256</text>
+<text text-anchor="start" x="1446.04" y="-1942.3" font-family="Times,serif" font-size="14.00">volume: uint256</text>
+<text text-anchor="start" x="1446.04" y="-1925.5" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
+<text text-anchor="start" x="1446.04" y="-1908.7" font-family="Times,serif" font-size="14.00">apprestrict: address</text>
+<text text-anchor="start" x="1446.04" y="-1891.9" font-family="Times,serif" font-size="14.00">workerpoolrestrict: address</text>
+<text text-anchor="start" x="1446.04" y="-1875.1" font-family="Times,serif" font-size="14.00">requesterrestrict: address</text>
+<text text-anchor="start" x="1446.04" y="-1858.3" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
+<text text-anchor="start" x="1446.04" y="-1841.5" font-family="Times,serif" font-size="14.00">sign: bytes</text>
 </g>
 <!-- 11&#45;&gt;54 -->
 <g id="edge6" class="edge">
 <title>11&#45;&gt;54</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1978.99,-302.24C1925.69,-333.03 1877.23,-372.38 1842.61,-422.6 1820.63,-454.47 1759.04,-1774.96 1756.61,-1813.6 1754.88,-1841.08 1753,-1870.65 1751.22,-1898.49"/>
-<polygon fill="black" stroke="black" points="1747.71,-1898.46 1750.57,-1908.66 1754.7,-1898.91 1747.71,-1898.46"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1789.51,-302.14C1785.03,-431.04 1774.97,-653.15 1754.65,-842.8 1715.38,-1209.38 1704.32,-1301.99 1626.65,-1662.4 1615.15,-1715.77 1599.53,-1774.09 1585.36,-1823.52"/>
+<polygon fill="black" stroke="black" points="1581.95,-1822.71 1582.55,-1833.28 1588.68,-1824.64 1581.95,-1822.71"/>
 </g>
 <!-- 55 -->
 <g id="node24" class="node">
 <title>55</title>
-<polygon fill="#f2f2f2" stroke="black" points="0,-1892.1 0,-2143.3 223.22,-2143.3 223.22,-1892.1 0,-1892.1"/>
-<text text-anchor="middle" x="111.61" y="-2126.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="111.61" y="-2109.9" font-family="Times,serif" font-size="14.00">WorkerpoolOrder</text>
-<text text-anchor="middle" x="111.61" y="-2093.1" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="0,-2084.9 223.22,-2084.9 "/>
-<text text-anchor="start" x="8" y="-2068.3" font-family="Times,serif" font-size="14.00">workerpool: address</text>
-<text text-anchor="start" x="8" y="-2051.5" font-family="Times,serif" font-size="14.00">workerpoolprice: uint256</text>
-<text text-anchor="start" x="8" y="-2034.7" font-family="Times,serif" font-size="14.00">volume: uint256</text>
-<text text-anchor="start" x="8" y="-2017.9" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
-<text text-anchor="start" x="8" y="-2001.1" font-family="Times,serif" font-size="14.00">category: uint256</text>
-<text text-anchor="start" x="8" y="-1984.3" font-family="Times,serif" font-size="14.00">trust: uint256</text>
-<text text-anchor="start" x="8" y="-1967.5" font-family="Times,serif" font-size="14.00">apprestrict: address</text>
-<text text-anchor="start" x="8" y="-1950.7" font-family="Times,serif" font-size="14.00">datasetrestrict: address</text>
-<text text-anchor="start" x="8" y="-1933.9" font-family="Times,serif" font-size="14.00">requesterrestrict: address</text>
-<text text-anchor="start" x="8" y="-1917.1" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
-<text text-anchor="start" x="8" y="-1900.3" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+<polygon fill="#f2f2f2" stroke="black" points="74.04,-1816.5 74.04,-2067.7 297.26,-2067.7 297.26,-1816.5 74.04,-1816.5"/>
+<text text-anchor="middle" x="185.65" y="-2051.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="185.65" y="-2034.3" font-family="Times,serif" font-size="14.00">WorkerpoolOrder</text>
+<text text-anchor="middle" x="185.65" y="-2017.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="74.04,-2009.3 297.26,-2009.3 "/>
+<text text-anchor="start" x="82.04" y="-1992.7" font-family="Times,serif" font-size="14.00">workerpool: address</text>
+<text text-anchor="start" x="82.04" y="-1975.9" font-family="Times,serif" font-size="14.00">workerpoolprice: uint256</text>
+<text text-anchor="start" x="82.04" y="-1959.1" font-family="Times,serif" font-size="14.00">volume: uint256</text>
+<text text-anchor="start" x="82.04" y="-1942.3" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
+<text text-anchor="start" x="82.04" y="-1925.5" font-family="Times,serif" font-size="14.00">category: uint256</text>
+<text text-anchor="start" x="82.04" y="-1908.7" font-family="Times,serif" font-size="14.00">trust: uint256</text>
+<text text-anchor="start" x="82.04" y="-1891.9" font-family="Times,serif" font-size="14.00">apprestrict: address</text>
+<text text-anchor="start" x="82.04" y="-1875.1" font-family="Times,serif" font-size="14.00">datasetrestrict: address</text>
+<text text-anchor="start" x="82.04" y="-1858.3" font-family="Times,serif" font-size="14.00">requesterrestrict: address</text>
+<text text-anchor="start" x="82.04" y="-1841.5" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
+<text text-anchor="start" x="82.04" y="-1824.7" font-family="Times,serif" font-size="14.00">sign: bytes</text>
 </g>
 <!-- 11&#45;&gt;55 -->
 <g id="edge12" class="edge">
 <title>11&#45;&gt;55</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1648.51,-233.2C1100.98,-270.2 415.21,-333.5 315.61,-422.6 -103.53,-797.56 10.89,-1570.28 78.5,-1881.97"/>
-<polygon fill="black" stroke="black" points="75.13,-1882.94 80.69,-1891.96 81.97,-1881.44 75.13,-1882.94"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1094.42,-244.36C652.36,-283.36 151.41,-344.06 82.65,-422.6 -98.87,-629.97 69.76,-1390.32 113.65,-1662.4 121.31,-1709.86 133.38,-1761 145.46,-1806.36"/>
+<polygon fill="black" stroke="black" points="142.14,-1807.5 148.12,-1816.24 148.9,-1805.68 142.14,-1807.5"/>
 </g>
 <!-- 56 -->
 <g id="node25" class="node">
 <title>56</title>
-<polygon fill="#f2f2f2" stroke="black" points="241,-1850.1 241,-2185.3 464.22,-2185.3 464.22,-1850.1 241,-1850.1"/>
-<text text-anchor="middle" x="352.61" y="-2168.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="352.61" y="-2151.9" font-family="Times,serif" font-size="14.00">RequestOrder</text>
-<text text-anchor="middle" x="352.61" y="-2135.1" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="241,-2126.9 464.22,-2126.9 "/>
-<text text-anchor="start" x="249" y="-2110.3" font-family="Times,serif" font-size="14.00">app: address</text>
-<text text-anchor="start" x="249" y="-2093.5" font-family="Times,serif" font-size="14.00">appmaxprice: uint256</text>
-<text text-anchor="start" x="249" y="-2076.7" font-family="Times,serif" font-size="14.00">dataset: address</text>
-<text text-anchor="start" x="249" y="-2059.9" font-family="Times,serif" font-size="14.00">datasetmaxprice: uint256</text>
-<text text-anchor="start" x="249" y="-2043.1" font-family="Times,serif" font-size="14.00">workerpool: address</text>
-<text text-anchor="start" x="249" y="-2026.3" font-family="Times,serif" font-size="14.00">workerpoolmaxprice: uint256</text>
-<text text-anchor="start" x="249" y="-2009.5" font-family="Times,serif" font-size="14.00">requester: address</text>
-<text text-anchor="start" x="249" y="-1992.7" font-family="Times,serif" font-size="14.00">volume: uint256</text>
-<text text-anchor="start" x="249" y="-1975.9" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
-<text text-anchor="start" x="249" y="-1959.1" font-family="Times,serif" font-size="14.00">category: uint256</text>
-<text text-anchor="start" x="249" y="-1942.3" font-family="Times,serif" font-size="14.00">trust: uint256</text>
-<text text-anchor="start" x="249" y="-1925.5" font-family="Times,serif" font-size="14.00">beneficiary: address</text>
-<text text-anchor="start" x="249" y="-1908.7" font-family="Times,serif" font-size="14.00">callback: address</text>
-<text text-anchor="start" x="249" y="-1891.9" font-family="Times,serif" font-size="14.00">params: string</text>
-<text text-anchor="start" x="249" y="-1875.1" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
-<text text-anchor="start" x="249" y="-1858.3" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+<polygon fill="#f2f2f2" stroke="black" points="1679.04,-1774.5 1679.04,-2109.7 1902.26,-2109.7 1902.26,-1774.5 1679.04,-1774.5"/>
+<text text-anchor="middle" x="1790.65" y="-2093.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="1790.65" y="-2076.3" font-family="Times,serif" font-size="14.00">RequestOrder</text>
+<text text-anchor="middle" x="1790.65" y="-2059.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="1679.04,-2051.3 1902.26,-2051.3 "/>
+<text text-anchor="start" x="1687.04" y="-2034.7" font-family="Times,serif" font-size="14.00">app: address</text>
+<text text-anchor="start" x="1687.04" y="-2017.9" font-family="Times,serif" font-size="14.00">appmaxprice: uint256</text>
+<text text-anchor="start" x="1687.04" y="-2001.1" font-family="Times,serif" font-size="14.00">dataset: address</text>
+<text text-anchor="start" x="1687.04" y="-1984.3" font-family="Times,serif" font-size="14.00">datasetmaxprice: uint256</text>
+<text text-anchor="start" x="1687.04" y="-1967.5" font-family="Times,serif" font-size="14.00">workerpool: address</text>
+<text text-anchor="start" x="1687.04" y="-1950.7" font-family="Times,serif" font-size="14.00">workerpoolmaxprice: uint256</text>
+<text text-anchor="start" x="1687.04" y="-1933.9" font-family="Times,serif" font-size="14.00">requester: address</text>
+<text text-anchor="start" x="1687.04" y="-1917.1" font-family="Times,serif" font-size="14.00">volume: uint256</text>
+<text text-anchor="start" x="1687.04" y="-1900.3" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
+<text text-anchor="start" x="1687.04" y="-1883.5" font-family="Times,serif" font-size="14.00">category: uint256</text>
+<text text-anchor="start" x="1687.04" y="-1866.7" font-family="Times,serif" font-size="14.00">trust: uint256</text>
+<text text-anchor="start" x="1687.04" y="-1849.9" font-family="Times,serif" font-size="14.00">beneficiary: address</text>
+<text text-anchor="start" x="1687.04" y="-1833.1" font-family="Times,serif" font-size="14.00">callback: address</text>
+<text text-anchor="start" x="1687.04" y="-1816.3" font-family="Times,serif" font-size="14.00">params: string</text>
+<text text-anchor="start" x="1687.04" y="-1799.5" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
+<text text-anchor="start" x="1687.04" y="-1782.7" font-family="Times,serif" font-size="14.00">sign: bytes</text>
 </g>
 <!-- 11&#45;&gt;56 -->
 <g id="edge13" class="edge">
 <title>11&#45;&gt;56</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1648.46,-239.4C1271.82,-273.65 851.35,-330.92 687.61,-422.6 298.87,-640.26 283.28,-881.67 253.61,-1326.2 239.18,-1542.34 204.9,-1602.52 253.61,-1813.6 255.65,-1822.44 258.13,-1831.34 260.95,-1840.22"/>
-<polygon fill="black" stroke="black" points="257.67,-1841.46 264.15,-1849.85 264.32,-1839.25 257.67,-1841.46"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1792.53,-302.25C1792.19,-594.63 1791.27,-1403.99 1790.86,-1764.23"/>
+<polygon fill="black" stroke="black" points="1787.36,-1764.22 1790.84,-1774.23 1794.36,-1764.23 1787.36,-1764.22"/>
 </g>
 <!-- 61 -->
 <g id="node30" class="node">
 <title>61</title>
-<polygon fill="#f2f2f2" stroke="black" points="4592.16,-1013.7 4592.16,-1155.3 4857.05,-1155.3 4857.05,-1013.7 4592.16,-1013.7"/>
-<text text-anchor="middle" x="4724.61" y="-1138.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
-<text text-anchor="middle" x="4724.61" y="-1121.9" font-family="Times,serif" font-size="14.00">PocoStorageLib</text>
-<text text-anchor="middle" x="4724.61" y="-1105.1" font-family="Times,serif" font-size="14.00">contracts/libs/PocoStorageLib.sol</text>
-<polyline fill="none" stroke="black" points="4592.16,-1096.9 4857.05,-1096.9 "/>
-<text text-anchor="start" x="4600.16" y="-1080.3" font-family="Times,serif" font-size="14.00">Private:</text>
-<text text-anchor="start" x="4600.16" y="-1063.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;POCO_STORAGE_LOCATION: bytes32</text>
-<polyline fill="none" stroke="black" points="4592.16,-1055.3 4857.05,-1055.3 "/>
-<text text-anchor="start" x="4600.16" y="-1038.7" font-family="Times,serif" font-size="14.00">Internal:</text>
-<text text-anchor="start" x="4600.16" y="-1021.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;getPocoStorage(): ($: PocoStorage)</text>
+<polygon fill="#f2f2f2" stroke="black" points="3790.21,-1423.5 3790.21,-1565.1 4055.1,-1565.1 4055.1,-1423.5 3790.21,-1423.5"/>
+<text text-anchor="middle" x="3922.65" y="-1548.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
+<text text-anchor="middle" x="3922.65" y="-1531.7" font-family="Times,serif" font-size="14.00">PocoStorageLib</text>
+<text text-anchor="middle" x="3922.65" y="-1514.9" font-family="Times,serif" font-size="14.00">contracts/libs/PocoStorageLib.sol</text>
+<polyline fill="none" stroke="black" points="3790.21,-1506.7 4055.1,-1506.7 "/>
+<text text-anchor="start" x="3798.21" y="-1490.1" font-family="Times,serif" font-size="14.00">Private:</text>
+<text text-anchor="start" x="3798.21" y="-1473.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;POCO_STORAGE_LOCATION: bytes32</text>
+<polyline fill="none" stroke="black" points="3790.21,-1465.1 4055.1,-1465.1 "/>
+<text text-anchor="start" x="3798.21" y="-1448.5" font-family="Times,serif" font-size="14.00">Internal:</text>
+<text text-anchor="start" x="3798.21" y="-1431.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;getPocoStorage(): ($: PocoStorage)</text>
 </g>
 <!-- 11&#45;&gt;61 -->
 <g id="edge7" class="edge">
 <title>11&#45;&gt;61</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3044.75,-219.7C3676.09,-249.73 4523.5,-310.45 4634.61,-422.6 4667.6,-455.9 4665.53,-796.46 4672.61,-842.8 4680.88,-896.95 4693.89,-957.2 4704.84,-1003.87"/>
-<polygon fill="black" stroke="black" points="4701.43,-1004.69 4707.14,-1013.62 4708.25,-1003.08 4701.43,-1004.69"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2065.65,-302.25C2483.81,-466.32 3264.93,-767.39 3554.65,-842.8 3604.29,-855.72 3747.12,-841.8 3782.65,-878.8 3846.41,-945.19 3806.04,-1201.51 3830.65,-1290.2 3842.44,-1332.67 3861.94,-1377.53 3879.96,-1414.26"/>
+<polygon fill="black" stroke="black" points="3876.92,-1416.02 3884.5,-1423.42 3883.19,-1412.9 3876.92,-1416.02"/>
 </g>
 <!-- 62 -->
 <g id="node31" class="node">
 <title>62</title>
-<polygon fill="#f2f2f2" stroke="black" points="4463.64,-1326.7 4463.64,-1813.1 4985.58,-1813.1 4985.58,-1326.7 4463.64,-1326.7"/>
-<text text-anchor="middle" x="4724.61" y="-1796.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="4724.61" y="-1779.7" font-family="Times,serif" font-size="14.00">PocoStorage</text>
-<text text-anchor="middle" x="4724.61" y="-1762.9" font-family="Times,serif" font-size="14.00">contracts/libs/PocoStorageLib.sol</text>
-<polyline fill="none" stroke="black" points="4463.64,-1754.7 4985.58,-1754.7 "/>
-<text text-anchor="start" x="4471.64" y="-1738.1" font-family="Times,serif" font-size="14.00">m_appregistry: IRegistry</text>
-<text text-anchor="start" x="4471.64" y="-1721.3" font-family="Times,serif" font-size="14.00">m_datasetregistry: IRegistry</text>
-<text text-anchor="start" x="4471.64" y="-1704.5" font-family="Times,serif" font-size="14.00">m_workerpoolregistry: IRegistry</text>
-<text text-anchor="start" x="4471.64" y="-1687.7" font-family="Times,serif" font-size="14.00">m_baseToken: IERC20</text>
-<text text-anchor="start" x="4471.64" y="-1670.9" font-family="Times,serif" font-size="14.00">m_name: string</text>
-<text text-anchor="start" x="4471.64" y="-1654.1" font-family="Times,serif" font-size="14.00">m_symbol: string</text>
-<text text-anchor="start" x="4471.64" y="-1637.3" font-family="Times,serif" font-size="14.00">m_decimals: uint8</text>
-<text text-anchor="start" x="4471.64" y="-1620.5" font-family="Times,serif" font-size="14.00">m_totalSupply: uint256</text>
-<text text-anchor="start" x="4471.64" y="-1603.7" font-family="Times,serif" font-size="14.00">m_balances: mapping(address=&gt;uint256)</text>
-<text text-anchor="start" x="4471.64" y="-1586.9" font-family="Times,serif" font-size="14.00">m_frozens: mapping(address=&gt;uint256)</text>
-<text text-anchor="start" x="4471.64" y="-1570.1" font-family="Times,serif" font-size="14.00">m_allowances: mapping(address=&gt;mapping(address=&gt;uint256))</text>
-<text text-anchor="start" x="4471.64" y="-1553.3" font-family="Times,serif" font-size="14.00">m_eip712DomainSeparator: bytes32</text>
-<text text-anchor="start" x="4471.64" y="-1536.5" font-family="Times,serif" font-size="14.00">m_presigned: mapping(bytes32=&gt;address)</text>
-<text text-anchor="start" x="4471.64" y="-1519.7" font-family="Times,serif" font-size="14.00">m_consumed: mapping(bytes32=&gt;uint256)</text>
-<text text-anchor="start" x="4471.64" y="-1502.9" font-family="Times,serif" font-size="14.00">m_deals: mapping(bytes32=&gt;IexecLibCore_v5.Deal)</text>
-<text text-anchor="start" x="4471.64" y="-1486.1" font-family="Times,serif" font-size="14.00">m_tasks: mapping(bytes32=&gt;IexecLibCore_v5.Task)</text>
-<text text-anchor="start" x="4471.64" y="-1469.3" font-family="Times,serif" font-size="14.00">m_consensus: mapping(bytes32=&gt;IexecLibCore_v5.Consensus)</text>
-<text text-anchor="start" x="4471.64" y="-1452.5" font-family="Times,serif" font-size="14.00">m_contributions: mapping(bytes32=&gt;mapping(address=&gt;IexecLibCore_v5.Contribution))</text>
-<text text-anchor="start" x="4471.64" y="-1435.7" font-family="Times,serif" font-size="14.00">m_workerScores: mapping(address=&gt;uint256)</text>
-<text text-anchor="start" x="4471.64" y="-1418.9" font-family="Times,serif" font-size="14.00">m_teebroker: address</text>
-<text text-anchor="start" x="4471.64" y="-1402.1" font-family="Times,serif" font-size="14.00">m_callbackgas: uint256</text>
-<text text-anchor="start" x="4471.64" y="-1385.3" font-family="Times,serif" font-size="14.00">m_categories: IexecLibCore_v5.Category[]</text>
-<text text-anchor="start" x="4471.64" y="-1368.5" font-family="Times,serif" font-size="14.00">m_v3_iexecHub: IexecHubV3Interface</text>
-<text text-anchor="start" x="4471.64" y="-1351.7" font-family="Times,serif" font-size="14.00">m_v3_scoreImported: mapping(address=&gt;bool)</text>
-<text text-anchor="start" x="4471.64" y="-1334.9" font-family="Times,serif" font-size="14.00">m_dealsBoost: mapping(bytes32=&gt;IexecLibCore_v5.DealBoost)</text>
+<polygon fill="#f2f2f2" stroke="black" points="3661.69,-1698.9 3661.69,-2185.3 4183.62,-2185.3 4183.62,-1698.9 3661.69,-1698.9"/>
+<text text-anchor="middle" x="3922.65" y="-2168.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="3922.65" y="-2151.9" font-family="Times,serif" font-size="14.00">PocoStorage</text>
+<text text-anchor="middle" x="3922.65" y="-2135.1" font-family="Times,serif" font-size="14.00">contracts/libs/PocoStorageLib.sol</text>
+<polyline fill="none" stroke="black" points="3661.69,-2126.9 4183.62,-2126.9 "/>
+<text text-anchor="start" x="3669.69" y="-2110.3" font-family="Times,serif" font-size="14.00">m_appregistry: IRegistry</text>
+<text text-anchor="start" x="3669.69" y="-2093.5" font-family="Times,serif" font-size="14.00">m_datasetregistry: IRegistry</text>
+<text text-anchor="start" x="3669.69" y="-2076.7" font-family="Times,serif" font-size="14.00">m_workerpoolregistry: IRegistry</text>
+<text text-anchor="start" x="3669.69" y="-2059.9" font-family="Times,serif" font-size="14.00">m_baseToken: IERC20</text>
+<text text-anchor="start" x="3669.69" y="-2043.1" font-family="Times,serif" font-size="14.00">m_name: string</text>
+<text text-anchor="start" x="3669.69" y="-2026.3" font-family="Times,serif" font-size="14.00">m_symbol: string</text>
+<text text-anchor="start" x="3669.69" y="-2009.5" font-family="Times,serif" font-size="14.00">m_decimals: uint8</text>
+<text text-anchor="start" x="3669.69" y="-1992.7" font-family="Times,serif" font-size="14.00">m_totalSupply: uint256</text>
+<text text-anchor="start" x="3669.69" y="-1975.9" font-family="Times,serif" font-size="14.00">m_balances: mapping(address=&gt;uint256)</text>
+<text text-anchor="start" x="3669.69" y="-1959.1" font-family="Times,serif" font-size="14.00">m_frozens: mapping(address=&gt;uint256)</text>
+<text text-anchor="start" x="3669.69" y="-1942.3" font-family="Times,serif" font-size="14.00">m_allowances: mapping(address=&gt;mapping(address=&gt;uint256))</text>
+<text text-anchor="start" x="3669.69" y="-1925.5" font-family="Times,serif" font-size="14.00">m_eip712DomainSeparator: bytes32</text>
+<text text-anchor="start" x="3669.69" y="-1908.7" font-family="Times,serif" font-size="14.00">m_presigned: mapping(bytes32=&gt;address)</text>
+<text text-anchor="start" x="3669.69" y="-1891.9" font-family="Times,serif" font-size="14.00">m_consumed: mapping(bytes32=&gt;uint256)</text>
+<text text-anchor="start" x="3669.69" y="-1875.1" font-family="Times,serif" font-size="14.00">m_deals: mapping(bytes32=&gt;IexecLibCore_v5.Deal)</text>
+<text text-anchor="start" x="3669.69" y="-1858.3" font-family="Times,serif" font-size="14.00">m_tasks: mapping(bytes32=&gt;IexecLibCore_v5.Task)</text>
+<text text-anchor="start" x="3669.69" y="-1841.5" font-family="Times,serif" font-size="14.00">m_consensus: mapping(bytes32=&gt;IexecLibCore_v5.Consensus)</text>
+<text text-anchor="start" x="3669.69" y="-1824.7" font-family="Times,serif" font-size="14.00">m_contributions: mapping(bytes32=&gt;mapping(address=&gt;IexecLibCore_v5.Contribution))</text>
+<text text-anchor="start" x="3669.69" y="-1807.9" font-family="Times,serif" font-size="14.00">m_workerScores: mapping(address=&gt;uint256)</text>
+<text text-anchor="start" x="3669.69" y="-1791.1" font-family="Times,serif" font-size="14.00">m_teebroker: address</text>
+<text text-anchor="start" x="3669.69" y="-1774.3" font-family="Times,serif" font-size="14.00">m_callbackgas: uint256</text>
+<text text-anchor="start" x="3669.69" y="-1757.5" font-family="Times,serif" font-size="14.00">m_categories: IexecLibCore_v5.Category[]</text>
+<text text-anchor="start" x="3669.69" y="-1740.7" font-family="Times,serif" font-size="14.00">m_v3_iexecHub: IexecHubV3Interface</text>
+<text text-anchor="start" x="3669.69" y="-1723.9" font-family="Times,serif" font-size="14.00">m_v3_scoreImported: mapping(address=&gt;bool)</text>
+<text text-anchor="start" x="3669.69" y="-1707.1" font-family="Times,serif" font-size="14.00">m_dealsBoost: mapping(bytes32=&gt;IexecLibCore_v5.DealBoost)</text>
 </g>
 <!-- 11&#45;&gt;62 -->
 <g id="edge8" class="edge">
 <title>11&#45;&gt;62</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2013.1,-302.14C1962.39,-333.08 1916.69,-372.52 1885.61,-422.6 1836.37,-501.94 1828.34,-769.04 1885.61,-842.8 2202.68,-1251.17 3805.78,-1468.78 4453.02,-1541.13"/>
-<polygon fill="black" stroke="black" points="4453.09,-1544.66 4463.42,-1542.29 4453.87,-1537.7 4453.09,-1544.66"/>
-</g>
-<!-- 78 -->
-<g id="node33" class="node">
-<title>78</title>
-<polygon fill="#f2f2f2" stroke="black" points="1895.04,-557.5 1895.04,-707.9 2204.18,-707.9 2204.18,-557.5 1895.04,-557.5"/>
-<text text-anchor="middle" x="2049.61" y="-691.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
-<text text-anchor="middle" x="2049.61" y="-674.5" font-family="Times,serif" font-size="14.00">IWorkerpool</text>
-<text text-anchor="middle" x="2049.61" y="-657.7" font-family="Times,serif" font-size="14.00">contracts/registries/workerpools/IWorkerpool.v8.sol</text>
-<polyline fill="none" stroke="black" points="1895.04,-649.5 2204.18,-649.5 "/>
-<text text-anchor="start" x="1903.04" y="-632.9" font-family="Times,serif" font-size="14.00">External:</text>
-<text text-anchor="start" x="1903.04" y="-616.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;owner(): address</text>
-<text text-anchor="start" x="1903.04" y="-599.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;m_workerpoolDescription(): string</text>
-<text text-anchor="start" x="1903.04" y="-582.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;m_schedulerRewardRatioPolicy(): uint256</text>
-<text text-anchor="start" x="1903.04" y="-565.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;m_workerStakeRatioPolicy(): uint256</text>
-</g>
-<!-- 11&#45;&gt;78 -->
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1971.94,-302.26C2011.71,-335.51 2048.56,-375.88 2070.65,-422.6 2090.61,-464.81 2100.63,-807.01 2070.65,-842.8 2012.1,-912.71 1927.21,-808.89 1868.65,-878.8 1809.95,-948.89 1814.65,-1216.43 1868.65,-1290.2 2082.2,-1581.89 3144.12,-1804.16 3651.65,-1895.56"/>
+<polygon fill="black" stroke="black" points="3651.21,-1899.04 3661.68,-1897.36 3652.45,-1892.15 3651.21,-1899.04"/>
+</g>
+<!-- 79 -->
+<g id="node34" class="node">
+<title>79</title>
+<polygon fill="#f2f2f2" stroke="black" points="1170.08,-557.5 1170.08,-707.9 1479.23,-707.9 1479.23,-557.5 1170.08,-557.5"/>
+<text text-anchor="middle" x="1324.65" y="-691.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
+<text text-anchor="middle" x="1324.65" y="-674.5" font-family="Times,serif" font-size="14.00">IWorkerpool</text>
+<text text-anchor="middle" x="1324.65" y="-657.7" font-family="Times,serif" font-size="14.00">contracts/registries/workerpools/IWorkerpool.v8.sol</text>
+<polyline fill="none" stroke="black" points="1170.08,-649.5 1479.23,-649.5 "/>
+<text text-anchor="start" x="1178.08" y="-632.9" font-family="Times,serif" font-size="14.00">External:</text>
+<text text-anchor="start" x="1178.08" y="-616.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;owner(): address</text>
+<text text-anchor="start" x="1178.08" y="-599.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;m_workerpoolDescription(): string</text>
+<text text-anchor="start" x="1178.08" y="-582.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;m_schedulerRewardRatioPolicy(): uint256</text>
+<text text-anchor="start" x="1178.08" y="-565.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;m_workerStakeRatioPolicy(): uint256</text>
+</g>
+<!-- 11&#45;&gt;79 -->
 <g id="edge15" class="edge">
-<title>11&#45;&gt;78</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2273.38,-302.14C2221.64,-378.35 2153.31,-478.97 2105.84,-548.89"/>
-<polygon fill="black" stroke="black" points="2102.87,-547.02 2100.15,-557.26 2108.67,-550.96 2102.87,-547.02"/>
+<title>11&#45;&gt;79</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1632.81,-302.16C1584.34,-338.01 1532.39,-379.77 1488.65,-422.6 1449.49,-460.95 1411.35,-508.75 1381.72,-548.96"/>
+<polygon fill="black" stroke="black" points="1378.81,-547.02 1375.72,-557.15 1384.45,-551.15 1378.81,-547.02"/>
 </g>
 <!-- 12 -->
 <g id="node4" class="node">
 <title>12</title>
-<polygon fill="#f2f2f2" stroke="black" points="5072.24,-0.5 5072.24,-386.1 6118.98,-386.1 6118.98,-0.5 5072.24,-0.5"/>
-<text text-anchor="middle" x="5595.61" y="-369.5" font-family="Times,serif" font-size="14.00">IexecPoco2Facet</text>
-<text text-anchor="middle" x="5595.61" y="-352.7" font-family="Times,serif" font-size="14.00">contracts/facets/IexecPoco2Facet.sol</text>
-<polyline fill="none" stroke="black" points="5072.24,-344.5 6118.98,-344.5 "/>
-<text text-anchor="start" x="5080.24" y="-327.9" font-family="Times,serif" font-size="14.00">Internal:</text>
-<text text-anchor="start" x="5080.24" y="-311.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;successWork(_dealid: bytes32, _taskid: bytes32)</text>
-<text text-anchor="start" x="5080.24" y="-294.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;failedWork(_dealid: bytes32, _taskid: bytes32)</text>
-<text text-anchor="start" x="5080.24" y="-277.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;checkConsensus(_taskid: bytes32, _consensus: bytes32)</text>
-<text text-anchor="start" x="5080.24" y="-260.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;distributeRewards(_taskid: bytes32)</text>
-<text text-anchor="start" x="5080.24" y="-243.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;distributeRewardsFast(_taskid: bytes32)</text>
-<text text-anchor="start" x="5080.24" y="-227.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;executeCallback(_taskid: bytes32, _resultsCallback: bytes)</text>
-<text text-anchor="start" x="5080.24" y="-210.3" font-family="Times,serif" font-size="14.00">External:</text>
-<text text-anchor="start" x="5080.24" y="-193.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;contribute(_taskid: bytes32, _resultHash: bytes32, _resultSeal: bytes32, _enclaveChallenge: address, _enclaveSign: bytes, _authorizationSign: bytes)</text>
-<text text-anchor="start" x="5080.24" y="-176.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;contributeAndFinalize(_taskid: bytes32, _resultDigest: bytes32, _results: bytes, _resultsCallback: bytes, _enclaveChallenge: address, _enclaveSign: bytes, _authorizationSign: bytes)</text>
-<text text-anchor="start" x="5080.24" y="-159.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;reveal(_taskid: bytes32, _resultDigest: bytes32)</text>
-<text text-anchor="start" x="5080.24" y="-143.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;reopen(_taskid: bytes32) &lt;&lt;onlyScheduler&gt;&gt;</text>
-<text text-anchor="start" x="5080.24" y="-126.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;finalize(_taskid: bytes32, _results: bytes, _resultsCallback: bytes) &lt;&lt;onlyScheduler&gt;&gt;</text>
-<text text-anchor="start" x="5080.24" y="-109.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;initializeArray(_dealid: bytes32[], _idx: uint256[]): bool</text>
-<text text-anchor="start" x="5080.24" y="-92.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;claimArray(_taskid: bytes32[]): bool</text>
-<text text-anchor="start" x="5080.24" y="-75.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;initializeAndClaimArray(_dealid: bytes32[], _idx: uint256[]): bool</text>
-<text text-anchor="start" x="5080.24" y="-59.1" font-family="Times,serif" font-size="14.00">Public:</text>
-<text text-anchor="start" x="5080.24" y="-42.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;modifier&gt;&gt; onlyScheduler(_taskId: bytes32)</text>
-<text text-anchor="start" x="5080.24" y="-25.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;initialize(_dealid: bytes32, idx: uint256): bytes32</text>
-<text text-anchor="start" x="5080.24" y="-8.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;claim(_taskid: bytes32)</text>
+<polygon fill="#f2f2f2" stroke="black" points="3992.28,-0.5 3992.28,-386.1 5039.02,-386.1 5039.02,-0.5 3992.28,-0.5"/>
+<text text-anchor="middle" x="4515.65" y="-369.5" font-family="Times,serif" font-size="14.00">IexecPoco2Facet</text>
+<text text-anchor="middle" x="4515.65" y="-352.7" font-family="Times,serif" font-size="14.00">contracts/facets/IexecPoco2Facet.sol</text>
+<polyline fill="none" stroke="black" points="3992.28,-344.5 5039.02,-344.5 "/>
+<text text-anchor="start" x="4000.28" y="-327.9" font-family="Times,serif" font-size="14.00">Internal:</text>
+<text text-anchor="start" x="4000.28" y="-311.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;successWork(_dealid: bytes32, _taskid: bytes32)</text>
+<text text-anchor="start" x="4000.28" y="-294.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;failedWork(_dealid: bytes32, _taskid: bytes32)</text>
+<text text-anchor="start" x="4000.28" y="-277.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;checkConsensus(_taskid: bytes32, _consensus: bytes32)</text>
+<text text-anchor="start" x="4000.28" y="-260.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;distributeRewards(_taskid: bytes32)</text>
+<text text-anchor="start" x="4000.28" y="-243.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;distributeRewardsFast(_taskid: bytes32)</text>
+<text text-anchor="start" x="4000.28" y="-227.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;executeCallback(_taskid: bytes32, _resultsCallback: bytes)</text>
+<text text-anchor="start" x="4000.28" y="-210.3" font-family="Times,serif" font-size="14.00">External:</text>
+<text text-anchor="start" x="4000.28" y="-193.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;contribute(_taskid: bytes32, _resultHash: bytes32, _resultSeal: bytes32, _enclaveChallenge: address, _enclaveSign: bytes, _authorizationSign: bytes)</text>
+<text text-anchor="start" x="4000.28" y="-176.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;contributeAndFinalize(_taskid: bytes32, _resultDigest: bytes32, _results: bytes, _resultsCallback: bytes, _enclaveChallenge: address, _enclaveSign: bytes, _authorizationSign: bytes)</text>
+<text text-anchor="start" x="4000.28" y="-159.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;reveal(_taskid: bytes32, _resultDigest: bytes32)</text>
+<text text-anchor="start" x="4000.28" y="-143.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;reopen(_taskid: bytes32) &lt;&lt;onlyScheduler&gt;&gt;</text>
+<text text-anchor="start" x="4000.28" y="-126.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;finalize(_taskid: bytes32, _results: bytes, _resultsCallback: bytes) &lt;&lt;onlyScheduler&gt;&gt;</text>
+<text text-anchor="start" x="4000.28" y="-109.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;initializeArray(_dealid: bytes32[], _idx: uint256[]): bool</text>
+<text text-anchor="start" x="4000.28" y="-92.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;claimArray(_taskid: bytes32[]): bool</text>
+<text text-anchor="start" x="4000.28" y="-75.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;initializeAndClaimArray(_dealid: bytes32[], _idx: uint256[]): bool</text>
+<text text-anchor="start" x="4000.28" y="-59.1" font-family="Times,serif" font-size="14.00">Public:</text>
+<text text-anchor="start" x="4000.28" y="-42.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;modifier&gt;&gt; onlyScheduler(_taskId: bytes32)</text>
+<text text-anchor="start" x="4000.28" y="-25.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;initialize(_dealid: bytes32, idx: uint256): bytes32</text>
+<text text-anchor="start" x="4000.28" y="-8.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;claim(_taskid: bytes32)</text>
 </g>
 <!-- 12&#45;&gt;3 -->
 <g id="edge18" class="edge">
 <title>12&#45;&gt;3</title>
-<path fill="none" stroke="black" d="M5482.01,-386.15C5469.11,-407.94 5455.99,-430.08 5443.19,-451.71"/>
-<polygon fill="none" stroke="black" points="5434.01,-446.6 5427.76,-477.77 5452.08,-457.3 5434.01,-446.6"/>
+<path fill="none" stroke="black" d="M3991.96,-359.06C3955.43,-378.22 3920.23,-399.35 3887.65,-422.6 3873.77,-432.51 3860.4,-443.85 3847.69,-456.01"/>
+<polygon fill="none" stroke="black" points="3839.75,-449.12 3826.26,-477.9 3854.75,-463.81 3839.75,-449.12"/>
 </g>
 <!-- 28 -->
 <g id="node8" class="node">
 <title>28</title>
-<polygon fill="#f2f2f2" stroke="black" points="5813.6,-423.1 5813.6,-842.3 6815.61,-842.3 6815.61,-423.1 5813.6,-423.1"/>
-<text text-anchor="middle" x="6314.61" y="-825.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
-<text text-anchor="middle" x="6314.61" y="-808.9" font-family="Times,serif" font-size="14.00">IexecPoco2</text>
-<text text-anchor="middle" x="6314.61" y="-792.1" font-family="Times,serif" font-size="14.00">contracts/interfaces/IexecPoco2.sol</text>
-<polyline fill="none" stroke="black" points="5813.6,-783.9 6815.61,-783.9 "/>
-<text text-anchor="start" x="5821.6" y="-767.3" font-family="Times,serif" font-size="14.00">External:</text>
-<text text-anchor="start" x="5821.6" y="-750.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;initialize(dealId: bytes32, index: uint256): bytes32</text>
-<text text-anchor="start" x="5821.6" y="-733.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;claim(taskId: bytes32)</text>
-<text text-anchor="start" x="5821.6" y="-716.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;contribute(taskId: bytes32, resultHash: bytes32, resultSeal: bytes32, enclaveChallenge: address, enclaveSign: bytes, authorizationSign: bytes)</text>
-<text text-anchor="start" x="5821.6" y="-700.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;contributeAndFinalize(taskId: bytes32, resultDigest: bytes32, results: bytes, resultsCallback: bytes, enclaveChallenge: address, enclaveSign: bytes, authorizationSign: bytes)</text>
-<text text-anchor="start" x="5821.6" y="-683.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;reveal(taskId: bytes32, resultDigest: bytes32)</text>
-<text text-anchor="start" x="5821.6" y="-666.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;reopen(taskId: bytes32)</text>
-<text text-anchor="start" x="5821.6" y="-649.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;finalize(taskId: bytes32, results: bytes, resultsCallback: bytes)</text>
-<text text-anchor="start" x="5821.6" y="-632.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;initializeArray(dealIds: bytes32[], indexes: uint256[]): bool</text>
-<text text-anchor="start" x="5821.6" y="-616.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;claimArray(taskIds: bytes32[]): bool</text>
-<text text-anchor="start" x="5821.6" y="-599.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;initializeAndClaimArray(dealIds: bytes32[], indexes: uint256[]): bool</text>
-<text text-anchor="start" x="5821.6" y="-582.5" font-family="Times,serif" font-size="14.00">Public:</text>
-<text text-anchor="start" x="5821.6" y="-565.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; AccurateContribution(worker: address, taskid: bytes32)</text>
-<text text-anchor="start" x="5821.6" y="-548.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; FaultyContribution(worker: address, taskid: bytes32)</text>
-<text text-anchor="start" x="5821.6" y="-532.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; TaskInitialize(taskid: bytes32, workerpool: address)</text>
-<text text-anchor="start" x="5821.6" y="-515.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; TaskContribute(taskid: bytes32, worker: address, hash: bytes32)</text>
-<text text-anchor="start" x="5821.6" y="-498.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; TaskConsensus(taskid: bytes32, consensus: bytes32)</text>
-<text text-anchor="start" x="5821.6" y="-481.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; TaskReveal(taskid: bytes32, worker: address, digest: bytes32)</text>
-<text text-anchor="start" x="5821.6" y="-464.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; TaskReopen(taskid: bytes32)</text>
-<text text-anchor="start" x="5821.6" y="-448.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; TaskFinalize(taskid: bytes32, results: bytes)</text>
-<text text-anchor="start" x="5821.6" y="-431.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; TaskClaimed(taskid: bytes32)</text>
+<polygon fill="#f2f2f2" stroke="black" points="4543.65,-423.1 4543.65,-842.3 5545.66,-842.3 5545.66,-423.1 4543.65,-423.1"/>
+<text text-anchor="middle" x="5044.65" y="-825.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
+<text text-anchor="middle" x="5044.65" y="-808.9" font-family="Times,serif" font-size="14.00">IexecPoco2</text>
+<text text-anchor="middle" x="5044.65" y="-792.1" font-family="Times,serif" font-size="14.00">contracts/interfaces/IexecPoco2.sol</text>
+<polyline fill="none" stroke="black" points="4543.65,-783.9 5545.66,-783.9 "/>
+<text text-anchor="start" x="4551.65" y="-767.3" font-family="Times,serif" font-size="14.00">External:</text>
+<text text-anchor="start" x="4551.65" y="-750.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;initialize(dealId: bytes32, index: uint256): bytes32</text>
+<text text-anchor="start" x="4551.65" y="-733.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;claim(taskId: bytes32)</text>
+<text text-anchor="start" x="4551.65" y="-716.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;contribute(taskId: bytes32, resultHash: bytes32, resultSeal: bytes32, enclaveChallenge: address, enclaveSign: bytes, authorizationSign: bytes)</text>
+<text text-anchor="start" x="4551.65" y="-700.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;contributeAndFinalize(taskId: bytes32, resultDigest: bytes32, results: bytes, resultsCallback: bytes, enclaveChallenge: address, enclaveSign: bytes, authorizationSign: bytes)</text>
+<text text-anchor="start" x="4551.65" y="-683.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;reveal(taskId: bytes32, resultDigest: bytes32)</text>
+<text text-anchor="start" x="4551.65" y="-666.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;reopen(taskId: bytes32)</text>
+<text text-anchor="start" x="4551.65" y="-649.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;finalize(taskId: bytes32, results: bytes, resultsCallback: bytes)</text>
+<text text-anchor="start" x="4551.65" y="-632.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;initializeArray(dealIds: bytes32[], indexes: uint256[]): bool</text>
+<text text-anchor="start" x="4551.65" y="-616.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;claimArray(taskIds: bytes32[]): bool</text>
+<text text-anchor="start" x="4551.65" y="-599.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;initializeAndClaimArray(dealIds: bytes32[], indexes: uint256[]): bool</text>
+<text text-anchor="start" x="4551.65" y="-582.5" font-family="Times,serif" font-size="14.00">Public:</text>
+<text text-anchor="start" x="4551.65" y="-565.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; AccurateContribution(worker: address, taskid: bytes32)</text>
+<text text-anchor="start" x="4551.65" y="-548.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; FaultyContribution(worker: address, taskid: bytes32)</text>
+<text text-anchor="start" x="4551.65" y="-532.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; TaskInitialize(taskid: bytes32, workerpool: address)</text>
+<text text-anchor="start" x="4551.65" y="-515.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; TaskContribute(taskid: bytes32, worker: address, hash: bytes32)</text>
+<text text-anchor="start" x="4551.65" y="-498.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; TaskConsensus(taskid: bytes32, consensus: bytes32)</text>
+<text text-anchor="start" x="4551.65" y="-481.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; TaskReveal(taskid: bytes32, worker: address, digest: bytes32)</text>
+<text text-anchor="start" x="4551.65" y="-464.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; TaskReopen(taskid: bytes32)</text>
+<text text-anchor="start" x="4551.65" y="-448.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; TaskFinalize(taskid: bytes32, results: bytes)</text>
+<text text-anchor="start" x="4551.65" y="-431.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; TaskClaimed(taskid: bytes32)</text>
 </g>
 <!-- 12&#45;&gt;28 -->
 <g id="edge17" class="edge">
 <title>12&#45;&gt;28</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5910.97,-386.15C5922.43,-393.12 5933.95,-400.13 5945.48,-407.14"/>
-<polygon fill="none" stroke="black" points="5940.47,-416.38 5971.55,-423 5951.38,-398.44 5940.47,-416.38"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4747.68,-386.15C4754.69,-391.95 4761.73,-397.77 4768.79,-403.6"/>
+<polygon fill="none" stroke="black" points="4762.23,-411.81 4792.04,-422.83 4775.61,-395.62 4762.23,-411.81"/>
 </g>
 <!-- 12&#45;&gt;34 -->
 <g id="edge26" class="edge">
 <title>12&#45;&gt;34</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5072.14,-313.68C4805.9,-374.39 4482.79,-448.08 4214.66,-509.23"/>
-<polygon fill="black" stroke="black" points="4213.71,-505.85 4204.74,-511.49 4215.27,-512.68 4213.71,-505.85"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3992,-350.47C3965.34,-371.55 3941.17,-395.46 3920.65,-422.6 3864.11,-497.39 3944.37,-772.22 3882.65,-842.8 3852.32,-877.48 3690.54,-920.85 3502.31,-961.18"/>
+<polygon fill="black" stroke="black" points="3501.52,-957.77 3492.47,-963.28 3502.98,-964.62 3501.52,-957.77"/>
 </g>
 <!-- 12&#45;&gt;35 -->
 <g id="edge23" class="edge">
 <title>12&#45;&gt;35</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5232.35,-386.22C5211.99,-398.26 5191.95,-410.44 5172.61,-422.6 5142.25,-441.69 5110.85,-462.88 5080.45,-484.23"/>
-<polygon fill="black" stroke="black" points="5078.06,-481.63 5071.9,-490.25 5082.09,-487.35 5078.06,-481.63"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4347.66,-386.15C4314.17,-424.4 4279.7,-463.77 4248.44,-499.47"/>
+<polygon fill="black" stroke="black" points="4245.77,-497.2 4241.82,-507.03 4251.04,-501.81 4245.77,-497.2"/>
 </g>
 <!-- 12&#45;&gt;36 -->
 <g id="edge21" class="edge">
 <title>12&#45;&gt;36</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5606.43,-386.41C5606.9,-398.65 5607.3,-410.8 5607.61,-422.6 5610.06,-515.95 5659.96,-765.48 5607.61,-842.8 5583.46,-878.47 5543.38,-844.28 5517.61,-878.8 5462.69,-952.38 5520.26,-1207.88 5479.61,-1290.2 5469.16,-1311.35 5450.07,-1304.59 5440.61,-1326.2 5397.17,-1425.42 5413.01,-1708.86 5440.61,-1813.6 5457.26,-1876.8 5498.58,-1940.99 5526.88,-1979.83"/>
-<polygon fill="black" stroke="black" points="5524.3,-1982.23 5533.06,-1988.2 5529.93,-1978.07 5524.3,-1982.23"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5039.13,-241.41C5282.91,-275.17 5535.81,-331.31 5611.65,-422.6 5655.67,-475.59 5664.14,-1602.2 5630.65,-1662.4 5615.9,-1688.91 5588.58,-1672.58 5572.65,-1698.4 5458.47,-1883.52 5645.48,-2002.33 5528.65,-2185.8 5514.38,-2208.21 5491.97,-2225.44 5468.92,-2238.35"/>
+<polygon fill="black" stroke="black" points="5467.23,-2235.28 5460.06,-2243.08 5470.53,-2241.45 5467.23,-2235.28"/>
 </g>
 <!-- 12&#45;&gt;43 -->
 <g id="edge22" class="edge">
 <title>12&#45;&gt;43</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5610.76,-386.4C5619.76,-550.65 5621.22,-771.47 5571.61,-842.8 5547.71,-877.15 5516.17,-851.32 5484.61,-878.8 5474.23,-887.83 5464.52,-897.99 5455.48,-908.83"/>
-<polygon fill="black" stroke="black" points="5452.58,-906.86 5449.02,-916.84 5458.02,-911.26 5452.58,-906.86"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4504.53,-386.32C4501.07,-516.4 4504.38,-691.49 4534.65,-842.8 4567.98,-1009.4 4639.73,-1189.08 4697.69,-1317.29"/>
+<polygon fill="black" stroke="black" points="4694.52,-1318.77 4701.84,-1326.43 4700.89,-1315.88 4694.52,-1318.77"/>
 </g>
 <!-- 46 -->
 <g id="node15" class="node">
 <title>46</title>
-<polygon fill="#f2f2f2" stroke="black" points="5526.44,-925.3 5526.44,-1243.7 5738.78,-1243.7 5738.78,-925.3 5526.44,-925.3"/>
-<text text-anchor="middle" x="5632.61" y="-1227.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="5632.61" y="-1210.3" font-family="Times,serif" font-size="14.00">Task</text>
-<text text-anchor="middle" x="5632.61" y="-1193.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
-<polyline fill="none" stroke="black" points="5526.44,-1185.3 5738.78,-1185.3 "/>
-<text text-anchor="start" x="5534.44" y="-1168.7" font-family="Times,serif" font-size="14.00">status: TaskStatusEnum</text>
-<text text-anchor="start" x="5534.44" y="-1151.9" font-family="Times,serif" font-size="14.00">dealid: bytes32</text>
-<text text-anchor="start" x="5534.44" y="-1135.1" font-family="Times,serif" font-size="14.00">idx: uint256</text>
-<text text-anchor="start" x="5534.44" y="-1118.3" font-family="Times,serif" font-size="14.00">timeref: uint256</text>
-<text text-anchor="start" x="5534.44" y="-1101.5" font-family="Times,serif" font-size="14.00">contributionDeadline: uint256</text>
-<text text-anchor="start" x="5534.44" y="-1084.7" font-family="Times,serif" font-size="14.00">revealDeadline: uint256</text>
-<text text-anchor="start" x="5534.44" y="-1067.9" font-family="Times,serif" font-size="14.00">finalDeadline: uint256</text>
-<text text-anchor="start" x="5534.44" y="-1051.1" font-family="Times,serif" font-size="14.00">consensusValue: bytes32</text>
-<text text-anchor="start" x="5534.44" y="-1034.3" font-family="Times,serif" font-size="14.00">revealCounter: uint256</text>
-<text text-anchor="start" x="5534.44" y="-1017.5" font-family="Times,serif" font-size="14.00">winnerCounter: uint256</text>
-<text text-anchor="start" x="5534.44" y="-1000.7" font-family="Times,serif" font-size="14.00">contributors: address[]</text>
-<text text-anchor="start" x="5534.44" y="-983.9" font-family="Times,serif" font-size="14.00">resultDigest: bytes32</text>
-<text text-anchor="start" x="5534.44" y="-967.1" font-family="Times,serif" font-size="14.00">results: bytes</text>
-<text text-anchor="start" x="5534.44" y="-950.3" font-family="Times,serif" font-size="14.00">resultsTimestamp: uint256</text>
-<text text-anchor="start" x="5534.44" y="-933.5" font-family="Times,serif" font-size="14.00">resultsCallback: bytes</text>
+<polygon fill="#f2f2f2" stroke="black" points="5696.49,-1335.1 5696.49,-1653.5 5908.82,-1653.5 5908.82,-1335.1 5696.49,-1335.1"/>
+<text text-anchor="middle" x="5802.65" y="-1636.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="5802.65" y="-1620.1" font-family="Times,serif" font-size="14.00">Task</text>
+<text text-anchor="middle" x="5802.65" y="-1603.3" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polyline fill="none" stroke="black" points="5696.49,-1595.1 5908.82,-1595.1 "/>
+<text text-anchor="start" x="5704.49" y="-1578.5" font-family="Times,serif" font-size="14.00">status: TaskStatusEnum</text>
+<text text-anchor="start" x="5704.49" y="-1561.7" font-family="Times,serif" font-size="14.00">dealid: bytes32</text>
+<text text-anchor="start" x="5704.49" y="-1544.9" font-family="Times,serif" font-size="14.00">idx: uint256</text>
+<text text-anchor="start" x="5704.49" y="-1528.1" font-family="Times,serif" font-size="14.00">timeref: uint256</text>
+<text text-anchor="start" x="5704.49" y="-1511.3" font-family="Times,serif" font-size="14.00">contributionDeadline: uint256</text>
+<text text-anchor="start" x="5704.49" y="-1494.5" font-family="Times,serif" font-size="14.00">revealDeadline: uint256</text>
+<text text-anchor="start" x="5704.49" y="-1477.7" font-family="Times,serif" font-size="14.00">finalDeadline: uint256</text>
+<text text-anchor="start" x="5704.49" y="-1460.9" font-family="Times,serif" font-size="14.00">consensusValue: bytes32</text>
+<text text-anchor="start" x="5704.49" y="-1444.1" font-family="Times,serif" font-size="14.00">revealCounter: uint256</text>
+<text text-anchor="start" x="5704.49" y="-1427.3" font-family="Times,serif" font-size="14.00">winnerCounter: uint256</text>
+<text text-anchor="start" x="5704.49" y="-1410.5" font-family="Times,serif" font-size="14.00">contributors: address[]</text>
+<text text-anchor="start" x="5704.49" y="-1393.7" font-family="Times,serif" font-size="14.00">resultDigest: bytes32</text>
+<text text-anchor="start" x="5704.49" y="-1376.9" font-family="Times,serif" font-size="14.00">results: bytes</text>
+<text text-anchor="start" x="5704.49" y="-1360.1" font-family="Times,serif" font-size="14.00">resultsTimestamp: uint256</text>
+<text text-anchor="start" x="5704.49" y="-1343.3" font-family="Times,serif" font-size="14.00">resultsCallback: bytes</text>
 </g>
 <!-- 12&#45;&gt;46 -->
 <g id="edge24" class="edge">
 <title>12&#45;&gt;46</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5642.55,-386.22C5644.55,-398.48 5646.27,-410.68 5647.61,-422.6 5666.34,-589.19 5658.81,-780.84 5648.89,-914.72"/>
-<polygon fill="black" stroke="black" points="5645.38,-914.83 5648.11,-925.06 5652.36,-915.35 5645.38,-914.83"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5039.35,-239.28C5299.52,-272.88 5576.65,-329.55 5663.65,-422.6 5891.92,-666.75 5869.63,-1090.25 5835.08,-1324.79"/>
+<polygon fill="black" stroke="black" points="5831.61,-1324.37 5833.59,-1334.78 5838.53,-1325.41 5831.61,-1324.37"/>
 </g>
 <!-- 47 -->
 <g id="node16" class="node">
 <title>47</title>
-<polygon fill="#f2f2f2" stroke="black" points="5717.36,-1519.9 5717.36,-1619.9 5933.85,-1619.9 5933.85,-1519.9 5717.36,-1519.9"/>
-<text text-anchor="middle" x="5825.61" y="-1603.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="5825.61" y="-1586.5" font-family="Times,serif" font-size="14.00">Consensus</text>
-<text text-anchor="middle" x="5825.61" y="-1569.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
-<polyline fill="none" stroke="black" points="5717.36,-1561.5 5933.85,-1561.5 "/>
-<text text-anchor="start" x="5725.36" y="-1544.9" font-family="Times,serif" font-size="14.00">group: mapping(bytes32=&gt;uint256)</text>
-<text text-anchor="start" x="5725.36" y="-1528.1" font-family="Times,serif" font-size="14.00">total: uint256</text>
+<polygon fill="#f2f2f2" stroke="black" points="5041.41,-1892.1 5041.41,-1992.1 5257.9,-1992.1 5257.9,-1892.1 5041.41,-1892.1"/>
+<text text-anchor="middle" x="5149.65" y="-1975.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="5149.65" y="-1958.7" font-family="Times,serif" font-size="14.00">Consensus</text>
+<text text-anchor="middle" x="5149.65" y="-1941.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polyline fill="none" stroke="black" points="5041.41,-1933.7 5257.9,-1933.7 "/>
+<text text-anchor="start" x="5049.41" y="-1917.1" font-family="Times,serif" font-size="14.00">group: mapping(bytes32=&gt;uint256)</text>
+<text text-anchor="start" x="5049.41" y="-1900.3" font-family="Times,serif" font-size="14.00">total: uint256</text>
 </g>
 <!-- 12&#45;&gt;47 -->
 <g id="edge27" class="edge">
 <title>12&#45;&gt;47</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5657.2,-386.26C5660.54,-398.51 5663.71,-410.7 5666.61,-422.6 5766.08,-831.54 5809.22,-1338.73 5821.62,-1509.59"/>
-<polygon fill="black" stroke="black" points="5818.13,-1509.91 5822.34,-1519.64 5825.12,-1509.41 5818.13,-1509.91"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5039.23,-248.22C5262.2,-283.01 5486.66,-338.04 5554.65,-422.6 5613.17,-495.37 5571.87,-751.02 5554.65,-842.8 5551.49,-859.67 5546.73,-862.74 5540.65,-878.8 5396.3,-1260.24 5229.03,-1721.36 5170.87,-1882.3"/>
+<polygon fill="black" stroke="black" points="5167.47,-1881.41 5167.36,-1892.01 5174.05,-1883.79 5167.47,-1881.41"/>
 </g>
 <!-- 49 -->
 <g id="node18" class="node">
 <title>49</title>
-<polygon fill="#f2f2f2" stroke="black" points="6018.44,-1009.3 6018.44,-1159.7 6230.78,-1159.7 6230.78,-1009.3 6018.44,-1009.3"/>
-<text text-anchor="middle" x="6124.61" y="-1143.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="6124.61" y="-1126.3" font-family="Times,serif" font-size="14.00">Contribution</text>
-<text text-anchor="middle" x="6124.61" y="-1109.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
-<polyline fill="none" stroke="black" points="6018.44,-1101.3 6230.78,-1101.3 "/>
-<text text-anchor="start" x="6026.44" y="-1084.7" font-family="Times,serif" font-size="14.00">status: ContributionStatusEnum</text>
-<text text-anchor="start" x="6026.44" y="-1067.9" font-family="Times,serif" font-size="14.00">resultHash: bytes32</text>
-<text text-anchor="start" x="6026.44" y="-1051.1" font-family="Times,serif" font-size="14.00">resultSeal: bytes32</text>
-<text text-anchor="start" x="6026.44" y="-1034.3" font-family="Times,serif" font-size="14.00">enclaveChallenge: address</text>
-<text text-anchor="start" x="6026.44" y="-1017.5" font-family="Times,serif" font-size="14.00">weight: uint256</text>
+<polygon fill="#f2f2f2" stroke="black" points="5409.49,-1419.1 5409.49,-1569.5 5621.82,-1569.5 5621.82,-1419.1 5409.49,-1419.1"/>
+<text text-anchor="middle" x="5515.65" y="-1552.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="5515.65" y="-1536.1" font-family="Times,serif" font-size="14.00">Contribution</text>
+<text text-anchor="middle" x="5515.65" y="-1519.3" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polyline fill="none" stroke="black" points="5409.49,-1511.1 5621.82,-1511.1 "/>
+<text text-anchor="start" x="5417.49" y="-1494.5" font-family="Times,serif" font-size="14.00">status: ContributionStatusEnum</text>
+<text text-anchor="start" x="5417.49" y="-1477.7" font-family="Times,serif" font-size="14.00">resultHash: bytes32</text>
+<text text-anchor="start" x="5417.49" y="-1460.9" font-family="Times,serif" font-size="14.00">resultSeal: bytes32</text>
+<text text-anchor="start" x="5417.49" y="-1444.1" font-family="Times,serif" font-size="14.00">enclaveChallenge: address</text>
+<text text-anchor="start" x="5417.49" y="-1427.3" font-family="Times,serif" font-size="14.00">weight: uint256</text>
 </g>
 <!-- 12&#45;&gt;49 -->
 <g id="edge25" class="edge">
 <title>12&#45;&gt;49</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5745.28,-386.19C5751.41,-398.18 5756.93,-410.36 5761.61,-422.6 5828.68,-597.94 5712.32,-679.32 5804.61,-842.8 5850.82,-924.66 5937.49,-987.19 6008.99,-1027.98"/>
-<polygon fill="black" stroke="black" points="6007.64,-1031.24 6018.07,-1033.1 6011.07,-1025.14 6007.64,-1031.24"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5039.18,-243.74C5274.53,-277.86 5515.63,-333.63 5587.65,-422.6 5649.15,-498.57 5561.44,-1169.52 5527.82,-1408.9"/>
+<polygon fill="black" stroke="black" points="5524.33,-1408.56 5526.4,-1418.95 5531.26,-1409.53 5524.33,-1408.56"/>
 </g>
 <!-- 12&#45;&gt;61 -->
 <g id="edge19" class="edge">
 <title>12&#45;&gt;61</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5550.15,-386.1C5547.78,-398.42 5545.57,-410.67 5543.61,-422.6 5528.38,-515.22 5567.64,-777.09 5500.61,-842.8 5431.03,-911.02 5156.32,-848.82 5063.61,-878.8 4975.94,-907.15 4887.15,-961.91 4822.45,-1007.67"/>
-<polygon fill="black" stroke="black" points="4820.39,-1004.84 4814.28,-1013.49 4824.46,-1010.54 4820.39,-1004.84"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4400.78,-386.42C4395.85,-398.45 4391.4,-410.56 4387.65,-422.6 4330.05,-607.47 4414.18,-1129.16 4306.65,-1290.2 4250.95,-1373.63 4149.46,-1425.19 4064.81,-1455.48"/>
+<polygon fill="black" stroke="black" points="4063.64,-1452.18 4055.36,-1458.8 4065.96,-1458.79 4063.64,-1452.18"/>
 </g>
 <!-- 12&#45;&gt;62 -->
 <g id="edge20" class="edge">
 <title>12&#45;&gt;62</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5575.17,-386.1C5573.94,-398.45 5572.74,-410.7 5571.61,-422.6 5567.16,-469.25 5568.08,-809.01 5535.61,-842.8 5491.22,-888.99 5305.11,-846.81 5249.61,-878.8 5155.93,-932.79 5002.08,-1143.47 4885.08,-1318"/>
-<polygon fill="black" stroke="black" points="4882.02,-1316.29 4879.37,-1326.55 4887.84,-1320.18 4882.02,-1316.29"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4495.83,-386.12C4457,-734.22 4362.74,-1453.3 4227.65,-1662.4 4216.45,-1679.75 4203.9,-1696.71 4190.47,-1713.17"/>
+<polygon fill="black" stroke="black" points="4187.49,-1711.28 4183.8,-1721.21 4192.88,-1715.75 4187.49,-1711.28"/>
 </g>
 <!-- 24 -->
 <g id="node5" class="node">
 <title>24</title>
-<polygon fill="#f2f2f2" stroke="black" points="4455.7,-1967.7 4455.7,-2067.7 4725.51,-2067.7 4725.51,-1967.7 4455.7,-1967.7"/>
-<text text-anchor="middle" x="4590.61" y="-2051.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
-<text text-anchor="middle" x="4590.61" y="-2034.3" font-family="Times,serif" font-size="14.00">IexecHubV3Interface</text>
-<text text-anchor="middle" x="4590.61" y="-2017.5" font-family="Times,serif" font-size="14.00">contracts/interfaces/IexecHubV3Interface.sol</text>
-<polyline fill="none" stroke="black" points="4455.7,-2009.3 4725.51,-2009.3 "/>
-<text text-anchor="start" x="4463.7" y="-1992.7" font-family="Times,serif" font-size="14.00">External:</text>
-<text text-anchor="start" x="4463.7" y="-1975.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;viewScore(worker: address): uint256</text>
+<polygon fill="#f2f2f2" stroke="black" points="3921.75,-2222.3 3921.75,-2322.3 4191.56,-2322.3 4191.56,-2222.3 3921.75,-2222.3"/>
+<text text-anchor="middle" x="4056.65" y="-2305.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
+<text text-anchor="middle" x="4056.65" y="-2288.9" font-family="Times,serif" font-size="14.00">IexecHubV3Interface</text>
+<text text-anchor="middle" x="4056.65" y="-2272.1" font-family="Times,serif" font-size="14.00">contracts/interfaces/IexecHubV3Interface.sol</text>
+<polyline fill="none" stroke="black" points="3921.75,-2263.9 4191.56,-2263.9 "/>
+<text text-anchor="start" x="3929.75" y="-2247.3" font-family="Times,serif" font-size="14.00">External:</text>
+<text text-anchor="start" x="3929.75" y="-2230.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;viewScore(worker: address): uint256</text>
 </g>
 <!-- 26&#45;&gt;50 -->
 <g id="edge28" class="edge">
 <title>26&#45;&gt;50</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1187.77,-758.4C1165.48,-793.2 1140.62,-832.03 1116.05,-870.41"/>
-<polygon fill="black" stroke="black" points="1112.93,-868.79 1110.48,-879.1 1118.82,-872.57 1112.93,-868.79"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M699.88,-758.4C722.55,-793.2 747.85,-832.03 772.84,-870.41"/>
+<polygon fill="black" stroke="black" points="770.12,-872.63 778.51,-879.1 775.98,-868.81 770.12,-872.63"/>
 </g>
 <!-- 26&#45;&gt;53 -->
 <g id="edge30" class="edge">
 <title>26&#45;&gt;53</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1359.42,-758.51C1451.03,-891.43 1585.67,-1111.79 1639.61,-1326.2 1666.04,-1431.24 1687.98,-1716.69 1639.61,-1813.6 1608.09,-1876.75 1546.55,-1925.4 1490.18,-1959.24"/>
-<polygon fill="black" stroke="black" points="1488.38,-1956.24 1481.54,-1964.33 1491.94,-1962.27 1488.38,-1956.24"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M528.27,-758.4C437.88,-891.45 304.87,-1112.12 251.65,-1326.2 215.6,-1471.21 180.59,-1530.96 251.65,-1662.4 265.55,-1688.1 284.55,-1679.3 306.65,-1698.4 350.56,-1736.34 393.96,-1783.08 430.15,-1825.38"/>
+<polygon fill="black" stroke="black" points="427.68,-1827.87 436.83,-1833.22 433.01,-1823.34 427.68,-1827.87"/>
 </g>
 <!-- 26&#45;&gt;54 -->
 <g id="edge29" class="edge">
 <title>26&#45;&gt;54</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1438.08,-758.61C1478.47,-794.1 1518.73,-835.09 1549.61,-878.8 1672.9,-1053.32 1683.07,-1116.8 1725.61,-1326.2 1765.76,-1523.83 1760.93,-1759.78 1752.88,-1898.42"/>
-<polygon fill="black" stroke="black" points="1749.38,-1898.45 1752.28,-1908.64 1756.36,-1898.87 1749.38,-1898.45"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M951.53,-758.35C1186.19,-867.32 1478.38,-1051.61 1593.65,-1326.2 1661.74,-1488.38 1624.27,-1695.74 1588.72,-1823.44"/>
+<polygon fill="black" stroke="black" points="1585.29,-1822.68 1585.94,-1833.26 1592.03,-1824.59 1585.29,-1822.68"/>
 </g>
 <!-- 26&#45;&gt;55 -->
 <g id="edge31" class="edge">
 <title>26&#45;&gt;55</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M771.92,-717.9C578.16,-759.51 385.25,-814.61 313.61,-878.8 155.29,-1020.64 187.77,-1118.07 144.61,-1326.2 123.37,-1428.6 115.76,-1711.59 113.06,-1881.83"/>
-<polygon fill="black" stroke="black" points="109.56,-1881.82 112.9,-1891.87 116.56,-1881.93 109.56,-1881.82"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M381.8,-758.5C335.65,-792.17 291.71,-832.38 259.65,-878.8 65.29,-1160.29 113.23,-1589.83 154.75,-1806.34"/>
+<polygon fill="black" stroke="black" points="151.32,-1807.03 156.66,-1816.18 158.19,-1805.69 151.32,-1807.03"/>
 </g>
 <!-- 26&#45;&gt;56 -->
 <g id="edge32" class="edge">
 <title>26&#45;&gt;56</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M938.05,-758.39C704.65,-867.61 413.46,-1052.19 298.61,-1326.2 229.71,-1490.57 258.7,-1696.08 295.32,-1839.98"/>
-<polygon fill="black" stroke="black" points="291.96,-1841 297.85,-1849.8 298.74,-1839.25 291.96,-1841"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M907.75,-758.34C988.46,-789.52 1076.98,-820.42 1160.65,-842.8 1261.03,-869.65 1304.42,-822.35 1391.65,-878.8 1688.35,-1070.81 1765.16,-1515.34 1784.55,-1764.22"/>
+<polygon fill="black" stroke="black" points="1781.08,-1764.74 1785.33,-1774.45 1788.06,-1764.21 1781.08,-1764.74"/>
 </g>
 <!-- 34&#45;&gt;61 -->
 <g id="edge33" class="edge">
 <title>34&#45;&gt;61</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3957.5,-753.94C4159.14,-840.57 4422.83,-953.85 4582.66,-1022.52"/>
-<polygon fill="black" stroke="black" points="4581.52,-1025.84 4592.09,-1026.57 4584.28,-1019.4 4581.52,-1025.84"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3149.23,-1205.79C3358.96,-1283.75 3621.78,-1381.45 3780.72,-1440.54"/>
+<polygon fill="black" stroke="black" points="3779.5,-1443.82 3790.1,-1444.02 3781.94,-1437.26 3779.5,-1443.82"/>
 </g>
 <!-- 34&#45;&gt;62 -->
 <g id="edge34" class="edge">
 <title>34&#45;&gt;62</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3812.34,-754.05C3974.31,-898.71 4250.01,-1144.98 4456.03,-1329"/>
-<polygon fill="black" stroke="black" points="4453.84,-1331.74 4463.63,-1335.79 4458.5,-1326.52 4453.84,-1331.74"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2979.92,-1205.82C3154.42,-1341.92 3441.81,-1566.07 3653.48,-1731.16"/>
+<polygon fill="black" stroke="black" points="3651.57,-1734.11 3661.61,-1737.5 3655.88,-1728.59 3651.57,-1734.11"/>
 </g>
 <!-- 35&#45;&gt;61 -->
 <g id="edge35" class="edge">
 <title>35&#45;&gt;61</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4834.2,-775.4C4807.37,-850.84 4775.36,-940.82 4752.89,-1004"/>
-<polygon fill="black" stroke="black" points="4749.56,-1002.92 4749.5,-1013.52 4756.15,-1005.27 4749.56,-1002.92"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4011.82,-758.5C3981.5,-787.43 3948.28,-817.21 3915.65,-842.8 3892.08,-861.29 3873.12,-852.56 3858.65,-878.8 3814.52,-958.87 3844.75,-1199.84 3858.65,-1290.2 3865.05,-1331.79 3878.41,-1376.55 3891.28,-1413.44"/>
+<polygon fill="black" stroke="black" points="3888.07,-1414.87 3894.71,-1423.13 3894.67,-1412.54 3888.07,-1414.87"/>
 </g>
 <!-- 35&#45;&gt;62 -->
 <g id="edge36" class="edge">
 <title>35&#45;&gt;62</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4898.09,-775.1C4906.84,-909.74 4909.59,-1116.97 4865.61,-1290.2 4863.35,-1299.08 4860.78,-1308 4857.95,-1316.91"/>
-<polygon fill="black" stroke="black" points="4854.57,-1315.99 4854.77,-1326.59 4861.22,-1318.18 4854.57,-1315.99"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4243.35,-758.47C4269.19,-794.84 4293.1,-836.29 4306.65,-878.8 4362.2,-1053 4353.46,-1113.45 4306.65,-1290.2 4269.01,-1432.34 4190.73,-1574.77 4114.61,-1690"/>
+<polygon fill="black" stroke="black" points="4111.52,-1688.33 4108.9,-1698.6 4117.35,-1692.21 4111.52,-1688.33"/>
+</g>
+<!-- 63 -->
+<g id="node32" class="node">
+<title>63</title>
+<polygon fill="#f2f2f2" stroke="black" points="3867.97,-984.1 3867.97,-1184.9 4297.33,-1184.9 4297.33,-984.1 3867.97,-984.1"/>
+<text text-anchor="middle" x="4082.65" y="-1168.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
+<text text-anchor="middle" x="4082.65" y="-1151.5" font-family="Times,serif" font-size="14.00">StakedRlcLib</text>
+<text text-anchor="middle" x="4082.65" y="-1134.7" font-family="Times,serif" font-size="14.00">contracts/libs/StakedRlcLib.sol</text>
+<polyline fill="none" stroke="black" points="3867.97,-1126.5 4297.33,-1126.5 "/>
+<text text-anchor="start" x="3875.97" y="-1109.9" font-family="Times,serif" font-size="14.00">Internal:</text>
+<text text-anchor="start" x="3875.97" y="-1093.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;transfer(from: address, to: address, value: uint256)</text>
+<text text-anchor="start" x="3875.97" y="-1076.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;mint(account: address, amount: uint256)</text>
+<text text-anchor="start" x="3875.97" y="-1059.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;burn(account: address, amount: uint256)</text>
+<text text-anchor="start" x="3875.97" y="-1042.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;approve(owner: address, spender: address, amount: uint256)</text>
+<text text-anchor="start" x="3875.97" y="-1025.9" font-family="Times,serif" font-size="14.00">Public:</text>
+<text text-anchor="start" x="3875.97" y="-1009.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Transfer(from: address, to: address, value: uint256)</text>
+<text text-anchor="start" x="3875.97" y="-992.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Approval(owner: address, spender: address, value: uint256)</text>
+</g>
+<!-- 35&#45;&gt;63 -->
+<g id="edge37" class="edge">
+<title>35&#45;&gt;63</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4118.79,-758.4C4111.29,-825.89 4102.1,-908.53 4094.87,-973.59"/>
+<polygon fill="black" stroke="black" points="4091.35,-973.55 4093.73,-983.88 4098.31,-974.33 4091.35,-973.55"/>
 </g>
 <!-- 42 -->
 <g id="node12" class="node">
 <title>42</title>
-<polygon fill="#f2f2f2" stroke="black" points="5143.44,-1511.5 5143.44,-1628.3 5355.78,-1628.3 5355.78,-1511.5 5143.44,-1511.5"/>
-<text text-anchor="middle" x="5249.61" y="-1611.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="5249.61" y="-1594.9" font-family="Times,serif" font-size="14.00">Resource</text>
-<text text-anchor="middle" x="5249.61" y="-1578.1" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
-<polyline fill="none" stroke="black" points="5143.44,-1569.9 5355.78,-1569.9 "/>
-<text text-anchor="start" x="5151.44" y="-1553.3" font-family="Times,serif" font-size="14.00">pointer: address</text>
-<text text-anchor="start" x="5151.44" y="-1536.5" font-family="Times,serif" font-size="14.00">owner: address</text>
-<text text-anchor="start" x="5151.44" y="-1519.7" font-family="Times,serif" font-size="14.00">price: uint256</text>
+<polygon fill="#f2f2f2" stroke="black" points="4811.49,-1883.7 4811.49,-2000.5 5023.82,-2000.5 5023.82,-1883.7 4811.49,-1883.7"/>
+<text text-anchor="middle" x="4917.65" y="-1983.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="4917.65" y="-1967.1" font-family="Times,serif" font-size="14.00">Resource</text>
+<text text-anchor="middle" x="4917.65" y="-1950.3" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polyline fill="none" stroke="black" points="4811.49,-1942.1 5023.82,-1942.1 "/>
+<text text-anchor="start" x="4819.49" y="-1925.5" font-family="Times,serif" font-size="14.00">pointer: address</text>
+<text text-anchor="start" x="4819.49" y="-1908.7" font-family="Times,serif" font-size="14.00">owner: address</text>
+<text text-anchor="start" x="4819.49" y="-1891.9" font-family="Times,serif" font-size="14.00">price: uint256</text>
 </g>
 <!-- 42&#45;&gt;36 -->
-<g id="edge39" class="edge">
+<g id="edge40" class="edge">
 <title>42&#45;&gt;36</title>
-<path fill="none" stroke="black" d="M5272.52,-1628.33C5294.05,-1679.16 5328.98,-1754.26 5369.61,-1813.6 5413.18,-1877.24 5475.68,-1941.31 5515.97,-1980.01"/>
-<polygon fill="black" stroke="black" points="5516.02,-1980.06 5523.13,-1981.31 5524.71,-1988.34 5517.61,-1987.1 5516.02,-1980.06"/>
+<path fill="none" stroke="black" d="M4929.79,-2000.52C4944.57,-2056.15 4975.03,-2138.79 5032.65,-2185.8 5097.33,-2238.56 5189.74,-2259.53 5263.22,-2267.52"/>
+<polygon fill="black" stroke="black" points="5263.37,-2267.53 5269.74,-2264.16 5275.31,-2268.74 5268.94,-2272.12 5263.37,-2267.53"/>
 </g>
 <!-- 43&#45;&gt;36 -->
-<g id="edge40" class="edge">
+<g id="edge41" class="edge">
 <title>43&#45;&gt;36</title>
-<path fill="none" stroke="black" d="M5369.51,-1252.24C5376.12,-1450.84 5389.21,-1762.31 5407.61,-1813.6 5430.96,-1878.72 5482.17,-1941.09 5517.76,-1979.13"/>
-<polygon fill="black" stroke="black" points="5518.18,-1979.57 5525.21,-1981.16 5526.45,-1988.26 5519.41,-1986.67 5518.18,-1979.57"/>
+<path fill="none" stroke="black" d="M4733.91,-1662.05C4698.85,-1817.18 4677.68,-2044.98 4802.65,-2185.8 4861.79,-2252.44 5111.63,-2267.9 5263.14,-2271.03"/>
+<polygon fill="black" stroke="black" points="5263.23,-2271.03 5269.3,-2267.15 5275.22,-2271.26 5269.15,-2275.14 5263.23,-2271.03"/>
 </g>
 <!-- 43&#45;&gt;42 -->
-<g id="edge44" class="edge">
+<g id="edge45" class="edge">
 <title>43&#45;&gt;42</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5324.95,-1252.2C5304.61,-1337.71 5280.96,-1437.13 5265.66,-1501.44"/>
-<polygon fill="black" stroke="black" points="5262.19,-1500.91 5263.28,-1511.45 5269,-1502.53 5262.19,-1500.91"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4833.74,-1661.93C4855.83,-1735.42 4880.54,-1817.65 4897.4,-1873.71"/>
+<polygon fill="black" stroke="black" points="4894.11,-1874.95 4900.34,-1883.52 4900.82,-1872.93 4894.11,-1874.95"/>
 </g>
 <!-- 45 -->
 <g id="node14" class="node">
 <title>45</title>
-<polygon fill="#f2f2f2" stroke="black" points="5449.44,-1494.7 5449.44,-1645.1 5661.78,-1645.1 5661.78,-1494.7 5449.44,-1494.7"/>
-<text text-anchor="middle" x="5555.61" y="-1628.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Enum&gt;&gt;</text>
-<text text-anchor="middle" x="5555.61" y="-1611.7" font-family="Times,serif" font-size="14.00">TaskStatusEnum</text>
-<text text-anchor="middle" x="5555.61" y="-1594.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
-<polyline fill="none" stroke="black" points="5449.44,-1586.7 5661.78,-1586.7 "/>
-<text text-anchor="start" x="5457.44" y="-1570.1" font-family="Times,serif" font-size="14.00">UNSET: 0</text>
-<text text-anchor="start" x="5457.44" y="-1553.3" font-family="Times,serif" font-size="14.00">ACTIVE: 1</text>
-<text text-anchor="start" x="5457.44" y="-1536.5" font-family="Times,serif" font-size="14.00">REVEALING: 2</text>
-<text text-anchor="start" x="5457.44" y="-1519.7" font-family="Times,serif" font-size="14.00">COMPLETED: 3</text>
-<text text-anchor="start" x="5457.44" y="-1502.9" font-family="Times,serif" font-size="14.00">FAILED: 4</text>
+<polygon fill="#f2f2f2" stroke="black" points="5581.49,-1866.9 5581.49,-2017.3 5793.82,-2017.3 5793.82,-1866.9 5581.49,-1866.9"/>
+<text text-anchor="middle" x="5687.65" y="-2000.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Enum&gt;&gt;</text>
+<text text-anchor="middle" x="5687.65" y="-1983.9" font-family="Times,serif" font-size="14.00">TaskStatusEnum</text>
+<text text-anchor="middle" x="5687.65" y="-1967.1" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polyline fill="none" stroke="black" points="5581.49,-1958.9 5793.82,-1958.9 "/>
+<text text-anchor="start" x="5589.49" y="-1942.3" font-family="Times,serif" font-size="14.00">UNSET: 0</text>
+<text text-anchor="start" x="5589.49" y="-1925.5" font-family="Times,serif" font-size="14.00">ACTIVE: 1</text>
+<text text-anchor="start" x="5589.49" y="-1908.7" font-family="Times,serif" font-size="14.00">REVEALING: 2</text>
+<text text-anchor="start" x="5589.49" y="-1891.9" font-family="Times,serif" font-size="14.00">COMPLETED: 3</text>
+<text text-anchor="start" x="5589.49" y="-1875.1" font-family="Times,serif" font-size="14.00">FAILED: 4</text>
 </g>
 <!-- 45&#45;&gt;36 -->
-<g id="edge37" class="edge">
+<g id="edge38" class="edge">
 <title>45&#45;&gt;36</title>
-<path fill="none" stroke="black" d="M5555.61,-1645.27C5555.61,-1740.34 5555.61,-1901.59 5555.61,-1976.38"/>
-<polygon fill="black" stroke="black" points="5555.61,-1976.46 5559.61,-1982.46 5555.61,-1988.46 5551.61,-1982.46 5555.61,-1976.46"/>
+<path fill="none" stroke="black" d="M5665.73,-2017.5C5646.98,-2070.18 5615.34,-2139.44 5567.65,-2185.8 5544.72,-2208.1 5514.92,-2225.28 5485.92,-2238.2"/>
+<polygon fill="black" stroke="black" points="5485.89,-2238.21 5481.95,-2244.25 5474.86,-2242.94 5478.8,-2236.9 5485.89,-2238.21"/>
 </g>
 <!-- 46&#45;&gt;36 -->
-<g id="edge41" class="edge">
+<g id="edge42" class="edge">
 <title>46&#45;&gt;36</title>
-<path fill="none" stroke="black" d="M5668.37,-1243.88C5695.72,-1393.32 5721,-1622.35 5670.61,-1813.6 5654.17,-1876.01 5613.67,-1939.37 5585.42,-1978.35"/>
-<polygon fill="black" stroke="black" points="5585.28,-1978.54 5584.94,-1985.74 5578.16,-1988.2 5578.5,-1980.99 5585.28,-1978.54"/>
+<path fill="none" stroke="black" d="M5854.51,-1653.65C5894.02,-1807.23 5923.37,-2038.1 5802.65,-2185.8 5765.04,-2231.82 5611.04,-2253.68 5500.18,-2263.63"/>
+<polygon fill="black" stroke="black" points="5499.86,-2263.65 5494.23,-2268.16 5487.9,-2264.69 5493.53,-2260.19 5499.86,-2263.65"/>
 </g>
 <!-- 46&#45;&gt;45 -->
-<g id="edge45" class="edge">
+<g id="edge46" class="edge">
 <title>46&#45;&gt;45</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5607.4,-1243.78C5594.61,-1324.06 5579.59,-1418.32 5569.03,-1484.62"/>
-<polygon fill="black" stroke="black" points="5565.56,-1484.18 5567.44,-1494.61 5572.47,-1485.28 5565.56,-1484.18"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5761.78,-1653.73C5744.09,-1722.34 5724.09,-1799.86 5709.33,-1857.08"/>
+<polygon fill="black" stroke="black" points="5705.93,-1856.25 5706.82,-1866.8 5712.71,-1858 5705.93,-1856.25"/>
 </g>
 <!-- 47&#45;&gt;36 -->
-<g id="edge42" class="edge">
+<g id="edge43" class="edge">
 <title>47&#45;&gt;36</title>
-<path fill="none" stroke="black" d="M5803.8,-1620.05C5780.97,-1669.99 5743.03,-1748.98 5703.61,-1813.6 5666.85,-1873.86 5617.44,-1939.07 5586.05,-1978.91"/>
-<polygon fill="black" stroke="black" points="5585.93,-1979.07 5585.34,-1986.25 5578.48,-1988.47 5579.07,-1981.29 5585.93,-1979.07"/>
+<path fill="none" stroke="black" d="M5165.36,-1992.16C5183.73,-2044.19 5217.95,-2126.83 5266.65,-2185.8 5282.5,-2204.99 5303.53,-2222.24 5323.27,-2236.14"/>
+<polygon fill="black" stroke="black" points="5323.53,-2236.32 5330.74,-2236.4 5333.44,-2243.09 5326.23,-2243.01 5323.53,-2236.32"/>
 </g>
 <!-- 48 -->
 <g id="node17" class="node">
 <title>48</title>
-<polygon fill="#f2f2f2" stroke="black" points="5951.44,-1503.1 5951.44,-1636.7 6163.78,-1636.7 6163.78,-1503.1 5951.44,-1503.1"/>
-<text text-anchor="middle" x="6057.61" y="-1620.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Enum&gt;&gt;</text>
-<text text-anchor="middle" x="6057.61" y="-1603.3" font-family="Times,serif" font-size="14.00">ContributionStatusEnum</text>
-<text text-anchor="middle" x="6057.61" y="-1586.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
-<polyline fill="none" stroke="black" points="5951.44,-1578.3 6163.78,-1578.3 "/>
-<text text-anchor="start" x="5959.44" y="-1561.7" font-family="Times,serif" font-size="14.00">UNSET: 0</text>
-<text text-anchor="start" x="5959.44" y="-1544.9" font-family="Times,serif" font-size="14.00">CONTRIBUTED: 1</text>
-<text text-anchor="start" x="5959.44" y="-1528.1" font-family="Times,serif" font-size="14.00">PROVED: 2</text>
-<text text-anchor="start" x="5959.44" y="-1511.3" font-family="Times,serif" font-size="14.00">REJECTED: 3</text>
+<polygon fill="#f2f2f2" stroke="black" points="5275.49,-1875.3 5275.49,-2008.9 5487.82,-2008.9 5487.82,-1875.3 5275.49,-1875.3"/>
+<text text-anchor="middle" x="5381.65" y="-1992.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Enum&gt;&gt;</text>
+<text text-anchor="middle" x="5381.65" y="-1975.5" font-family="Times,serif" font-size="14.00">ContributionStatusEnum</text>
+<text text-anchor="middle" x="5381.65" y="-1958.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polyline fill="none" stroke="black" points="5275.49,-1950.5 5487.82,-1950.5 "/>
+<text text-anchor="start" x="5283.49" y="-1933.9" font-family="Times,serif" font-size="14.00">UNSET: 0</text>
+<text text-anchor="start" x="5283.49" y="-1917.1" font-family="Times,serif" font-size="14.00">CONTRIBUTED: 1</text>
+<text text-anchor="start" x="5283.49" y="-1900.3" font-family="Times,serif" font-size="14.00">PROVED: 2</text>
+<text text-anchor="start" x="5283.49" y="-1883.5" font-family="Times,serif" font-size="14.00">REJECTED: 3</text>
 </g>
 <!-- 48&#45;&gt;36 -->
-<g id="edge38" class="edge">
+<g id="edge39" class="edge">
 <title>48&#45;&gt;36</title>
-<path fill="none" stroke="black" d="M6039.17,-1636.92C6021.58,-1689.98 5990.56,-1763.65 5942.61,-1813.6 5863.02,-1896.5 5742.16,-1952.4 5656.71,-1984.22"/>
-<polygon fill="black" stroke="black" points="5656.68,-1984.23 5652.43,-1990.05 5645.42,-1988.37 5649.67,-1982.54 5656.68,-1984.23"/>
+<path fill="none" stroke="black" d="M5381.65,-2009.12C5381.65,-2075.46 5381.65,-2175.57 5381.65,-2230.92"/>
+<polygon fill="black" stroke="black" points="5381.65,-2231.01 5385.65,-2237.01 5381.65,-2243.01 5377.65,-2237.01 5381.65,-2231.01"/>
 </g>
 <!-- 49&#45;&gt;36 -->
-<g id="edge43" class="edge">
+<g id="edge44" class="edge">
 <title>49&#45;&gt;36</title>
-<path fill="none" stroke="black" d="M6157.83,-1159.82C6215.74,-1301.87 6316.03,-1615.4 6172.61,-1813.6 6113.51,-1895.27 5836.05,-1961.92 5674.04,-1994.7"/>
-<polygon fill="black" stroke="black" points="5673.86,-1994.74 5668.77,-1999.84 5662.1,-1997.1 5667.19,-1991.99 5673.86,-1994.74"/>
+<path fill="none" stroke="black" d="M5521.62,-1569.65C5532.86,-1725.46 5551.39,-2080.53 5496.65,-2185.8 5486,-2206.29 5467.95,-2223.16 5449.28,-2236.34"/>
+<polygon fill="black" stroke="black" points="5449.16,-2236.42 5446.4,-2243.08 5439.18,-2243.09 5441.95,-2236.43 5449.16,-2236.42"/>
 </g>
 <!-- 49&#45;&gt;48 -->
-<g id="edge46" class="edge">
+<g id="edge47" class="edge">
 <title>49&#45;&gt;48</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M6114.32,-1159.71C6101.81,-1250.01 6080.79,-1401.69 6068.15,-1492.83"/>
-<polygon fill="black" stroke="black" points="6064.67,-1492.43 6066.77,-1502.81 6071.61,-1493.39 6064.67,-1492.43"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5493.3,-1569.67C5468.65,-1651.67 5429.2,-1782.91 5404.4,-1865.44"/>
+<polygon fill="black" stroke="black" points="5400.97,-1864.67 5401.45,-1875.25 5407.68,-1866.68 5400.97,-1864.67"/>
 </g>
 <!-- 52 -->
 <g id="node21" class="node">
 <title>52</title>
-<polygon fill="#f2f2f2" stroke="black" points="1109,-1503.1 1109,-1636.7 1332.22,-1636.7 1332.22,-1503.1 1109,-1503.1"/>
-<text text-anchor="middle" x="1220.61" y="-1620.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="1220.61" y="-1603.3" font-family="Times,serif" font-size="14.00">EIP712Domain</text>
-<text text-anchor="middle" x="1220.61" y="-1586.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="1109,-1578.3 1332.22,-1578.3 "/>
-<text text-anchor="start" x="1117" y="-1561.7" font-family="Times,serif" font-size="14.00">name: string</text>
-<text text-anchor="start" x="1117" y="-1544.9" font-family="Times,serif" font-size="14.00">version: string</text>
-<text text-anchor="start" x="1117" y="-1528.1" font-family="Times,serif" font-size="14.00">chainId: uint256</text>
-<text text-anchor="start" x="1117" y="-1511.3" font-family="Times,serif" font-size="14.00">verifyingContract: address</text>
+<polygon fill="#f2f2f2" stroke="black" points="559.04,-1427.5 559.04,-1561.1 782.26,-1561.1 782.26,-1427.5 559.04,-1427.5"/>
+<text text-anchor="middle" x="670.65" y="-1544.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="670.65" y="-1527.7" font-family="Times,serif" font-size="14.00">EIP712Domain</text>
+<text text-anchor="middle" x="670.65" y="-1510.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="559.04,-1502.7 782.26,-1502.7 "/>
+<text text-anchor="start" x="567.04" y="-1486.1" font-family="Times,serif" font-size="14.00">name: string</text>
+<text text-anchor="start" x="567.04" y="-1469.3" font-family="Times,serif" font-size="14.00">version: string</text>
+<text text-anchor="start" x="567.04" y="-1452.5" font-family="Times,serif" font-size="14.00">chainId: uint256</text>
+<text text-anchor="start" x="567.04" y="-1435.7" font-family="Times,serif" font-size="14.00">verifyingContract: address</text>
 </g>
 <!-- 50&#45;&gt;52 -->
-<g id="edge57" class="edge">
+<g id="edge58" class="edge">
 <title>50&#45;&gt;52</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1073.53,-1289.98C1079.65,-1302.23 1085.71,-1314.38 1091.61,-1326.2 1119.59,-1382.32 1150.99,-1445.85 1175.93,-1493.84"/>
-<polygon fill="black" stroke="black" points="1172.94,-1495.67 1180.67,-1502.92 1179.14,-1492.43 1172.94,-1495.67"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M784.05,-1290C756.99,-1335.8 730.4,-1381.56 709.76,-1418.04"/>
+<polygon fill="black" stroke="black" points="706.5,-1416.68 704.64,-1427.1 712.6,-1420.12 706.5,-1416.68"/>
 </g>
 <!-- 50&#45;&gt;53 -->
-<g id="edge58" class="edge">
+<g id="edge59" class="edge">
 <title>50&#45;&gt;53</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1196.69,-1188.74C1250.1,-1224.43 1300.98,-1269.95 1332.61,-1326.2 1385.91,-1420.98 1377.77,-1727.72 1371.67,-1898.75"/>
-<polygon fill="black" stroke="black" points="1368.17,-1898.68 1371.3,-1908.8 1375.16,-1898.93 1368.17,-1898.68"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M694.59,-1177.9C634.28,-1215.08 575.77,-1264.12 540.65,-1326.2 494.29,-1408.17 498.49,-1668.75 508.55,-1823.14"/>
+<polygon fill="black" stroke="black" points="505.06,-1823.4 509.22,-1833.15 512.05,-1822.94 505.06,-1823.4"/>
 </g>
 <!-- 50&#45;&gt;54 -->
-<g id="edge59" class="edge">
+<g id="edge60" class="edge">
 <title>50&#45;&gt;54</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1196.71,-1108.94C1341.61,-1136.45 1524.37,-1196.24 1630.61,-1326.2 1763.74,-1489.06 1764.18,-1748.36 1753.44,-1898.56"/>
-<polygon fill="black" stroke="black" points="1749.94,-1898.5 1752.69,-1908.73 1756.92,-1899.02 1749.94,-1898.5"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1128.66,-1105.86C1272.48,-1132.01 1451.25,-1191.43 1544.65,-1326.2 1598.39,-1403.74 1576.02,-1667.31 1559.98,-1823.08"/>
+<polygon fill="black" stroke="black" points="1556.48,-1822.87 1558.93,-1833.18 1563.45,-1823.59 1556.48,-1822.87"/>
 </g>
 <!-- 50&#45;&gt;55 -->
-<g id="edge60" class="edge">
+<g id="edge61" class="edge">
 <title>50&#45;&gt;55</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M762.53,-1107.94C609.75,-1135.02 411.54,-1194.72 289.61,-1326.2 215.01,-1406.64 154.32,-1704.88 126.82,-1882.02"/>
-<polygon fill="black" stroke="black" points="123.36,-1881.52 125.3,-1891.93 130.28,-1882.58 123.36,-1881.52"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M694.79,-1104.51C543.48,-1129.84 350.14,-1188.85 242.65,-1326.2 136.06,-1462.41 137.48,-1670.69 155.43,-1806.39"/>
+<polygon fill="black" stroke="black" points="151.98,-1807.01 156.81,-1816.44 158.92,-1806.06 151.98,-1807.01"/>
 </g>
 <!-- 50&#45;&gt;56 -->
-<g id="edge61" class="edge">
+<g id="edge62" class="edge">
 <title>50&#45;&gt;56</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M762.45,-1103.27C613.21,-1128 425.23,-1186.78 328.61,-1326.2 273.1,-1406.3 294.13,-1663.08 319.19,-1839.87"/>
-<polygon fill="black" stroke="black" points="315.73,-1840.4 320.61,-1849.81 322.66,-1839.41 315.73,-1840.4"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1128.64,-1112.63C1275.53,-1141.77 1464.04,-1202.01 1584.65,-1326.2 1645.95,-1389.31 1706.14,-1606.2 1745.61,-1764.56"/>
+<polygon fill="black" stroke="black" points="1742.25,-1765.57 1748.06,-1774.43 1749.05,-1763.88 1742.25,-1765.57"/>
 </g>
 <!-- 57 -->
 <g id="node26" class="node">
 <title>57</title>
-<polygon fill="#f2f2f2" stroke="black" points="868,-1511.5 868,-1628.3 1091.22,-1628.3 1091.22,-1511.5 868,-1511.5"/>
-<text text-anchor="middle" x="979.61" y="-1611.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="979.61" y="-1594.9" font-family="Times,serif" font-size="14.00">AppOrderOperation</text>
-<text text-anchor="middle" x="979.61" y="-1578.1" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="868,-1569.9 1091.22,-1569.9 "/>
-<text text-anchor="start" x="876" y="-1553.3" font-family="Times,serif" font-size="14.00">order: AppOrder</text>
-<text text-anchor="start" x="876" y="-1536.5" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
-<text text-anchor="start" x="876" y="-1519.7" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+<polygon fill="#f2f2f2" stroke="black" points="800.04,-1435.9 800.04,-1552.7 1023.26,-1552.7 1023.26,-1435.9 800.04,-1435.9"/>
+<text text-anchor="middle" x="911.65" y="-1536.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="911.65" y="-1519.3" font-family="Times,serif" font-size="14.00">AppOrderOperation</text>
+<text text-anchor="middle" x="911.65" y="-1502.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="800.04,-1494.3 1023.26,-1494.3 "/>
+<text text-anchor="start" x="808.04" y="-1477.7" font-family="Times,serif" font-size="14.00">order: AppOrder</text>
+<text text-anchor="start" x="808.04" y="-1460.9" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
+<text text-anchor="start" x="808.04" y="-1444.1" font-family="Times,serif" font-size="14.00">sign: bytes</text>
 </g>
 <!-- 50&#45;&gt;57 -->
-<g id="edge62" class="edge">
+<g id="edge63" class="edge">
 <title>50&#45;&gt;57</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M972.93,-1289.8C972.64,-1365.45 973.24,-1446.11 974.75,-1501.16"/>
-<polygon fill="black" stroke="black" points="971.26,-1501.58 975.05,-1511.48 978.26,-1501.38 971.26,-1501.58"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M904.9,-1290C904.91,-1338.86 905.43,-1387.68 906.47,-1425.23"/>
+<polygon fill="black" stroke="black" points="902.98,-1425.62 906.77,-1435.51 909.97,-1425.41 902.98,-1425.62"/>
 </g>
 <!-- 58 -->
 <g id="node27" class="node">
 <title>58</title>
-<polygon fill="#f2f2f2" stroke="black" points="1407,-1511.5 1407,-1628.3 1630.22,-1628.3 1630.22,-1511.5 1407,-1511.5"/>
-<text text-anchor="middle" x="1518.61" y="-1611.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="1518.61" y="-1594.9" font-family="Times,serif" font-size="14.00">DatasetOrderOperation</text>
-<text text-anchor="middle" x="1518.61" y="-1578.1" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="1407,-1569.9 1630.22,-1569.9 "/>
-<text text-anchor="start" x="1415" y="-1553.3" font-family="Times,serif" font-size="14.00">order: DatasetOrder</text>
-<text text-anchor="start" x="1415" y="-1536.5" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
-<text text-anchor="start" x="1415" y="-1519.7" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+<polygon fill="#f2f2f2" stroke="black" points="1080.04,-1435.9 1080.04,-1552.7 1303.26,-1552.7 1303.26,-1435.9 1080.04,-1435.9"/>
+<text text-anchor="middle" x="1191.65" y="-1536.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="1191.65" y="-1519.3" font-family="Times,serif" font-size="14.00">DatasetOrderOperation</text>
+<text text-anchor="middle" x="1191.65" y="-1502.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="1080.04,-1494.3 1303.26,-1494.3 "/>
+<text text-anchor="start" x="1088.04" y="-1477.7" font-family="Times,serif" font-size="14.00">order: DatasetOrder</text>
+<text text-anchor="start" x="1088.04" y="-1460.9" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
+<text text-anchor="start" x="1088.04" y="-1444.1" font-family="Times,serif" font-size="14.00">sign: bytes</text>
 </g>
 <!-- 50&#45;&gt;58 -->
-<g id="edge63" class="edge">
+<g id="edge64" class="edge">
 <title>50&#45;&gt;58</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1196.45,-1186.61C1262.07,-1223.77 1330.67,-1270.61 1383.61,-1326.2 1431.79,-1376.79 1466.22,-1449.42 1488.49,-1502.03"/>
-<polygon fill="black" stroke="black" points="1485.27,-1503.42 1492.37,-1511.28 1491.73,-1500.71 1485.27,-1503.42"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1045.31,-1290C1079.44,-1339.7 1114.07,-1389.35 1141.1,-1427.14"/>
+<polygon fill="black" stroke="black" points="1138.42,-1429.42 1147.09,-1435.51 1144.11,-1425.34 1138.42,-1429.42"/>
 </g>
 <!-- 59 -->
 <g id="node28" class="node">
 <title>59</title>
-<polygon fill="#f2f2f2" stroke="black" points="347,-1511.5 347,-1628.3 570.22,-1628.3 570.22,-1511.5 347,-1511.5"/>
-<text text-anchor="middle" x="458.61" y="-1611.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="458.61" y="-1594.9" font-family="Times,serif" font-size="14.00">WorkerpoolOrderOperation</text>
-<text text-anchor="middle" x="458.61" y="-1578.1" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="347,-1569.9 570.22,-1569.9 "/>
-<text text-anchor="start" x="355" y="-1553.3" font-family="Times,serif" font-size="14.00">order: WorkerpoolOrder</text>
-<text text-anchor="start" x="355" y="-1536.5" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
-<text text-anchor="start" x="355" y="-1519.7" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+<polygon fill="#f2f2f2" stroke="black" points="261.04,-1435.9 261.04,-1552.7 484.26,-1552.7 484.26,-1435.9 261.04,-1435.9"/>
+<text text-anchor="middle" x="372.65" y="-1536.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="372.65" y="-1519.3" font-family="Times,serif" font-size="14.00">WorkerpoolOrderOperation</text>
+<text text-anchor="middle" x="372.65" y="-1502.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="261.04,-1494.3 484.26,-1494.3 "/>
+<text text-anchor="start" x="269.04" y="-1477.7" font-family="Times,serif" font-size="14.00">order: WorkerpoolOrder</text>
+<text text-anchor="start" x="269.04" y="-1460.9" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
+<text text-anchor="start" x="269.04" y="-1444.1" font-family="Times,serif" font-size="14.00">sign: bytes</text>
 </g>
 <!-- 50&#45;&gt;59 -->
-<g id="edge64" class="edge">
+<g id="edge65" class="edge">
 <title>50&#45;&gt;59</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M762.78,-1180.67C694.76,-1218.83 623.47,-1267.76 569.61,-1326.2 522.82,-1376.96 490.23,-1449.35 472.63,-1501.85"/>
-<polygon fill="black" stroke="black" points="469.29,-1500.82 469.52,-1511.41 475.94,-1502.99 469.29,-1500.82"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M694.88,-1185.67C625.24,-1224.26 550.46,-1272.19 489.65,-1326.2 456.86,-1355.32 426.98,-1394.14 405.5,-1427.02"/>
+<polygon fill="black" stroke="black" points="402.39,-1425.38 399.94,-1435.69 408.28,-1429.16 402.39,-1425.38"/>
 </g>
 <!-- 60 -->
 <g id="node29" class="node">
 <title>60</title>
-<polygon fill="#f2f2f2" stroke="black" points="588,-1511.5 588,-1628.3 811.22,-1628.3 811.22,-1511.5 588,-1511.5"/>
-<text text-anchor="middle" x="699.61" y="-1611.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="699.61" y="-1594.9" font-family="Times,serif" font-size="14.00">RequestOrderOperation</text>
-<text text-anchor="middle" x="699.61" y="-1578.1" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="588,-1569.9 811.22,-1569.9 "/>
-<text text-anchor="start" x="596" y="-1553.3" font-family="Times,serif" font-size="14.00">order: RequestOrder</text>
-<text text-anchor="start" x="596" y="-1536.5" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
-<text text-anchor="start" x="596" y="-1519.7" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+<polygon fill="#f2f2f2" stroke="black" points="1321.04,-1435.9 1321.04,-1552.7 1544.26,-1552.7 1544.26,-1435.9 1321.04,-1435.9"/>
+<text text-anchor="middle" x="1432.65" y="-1536.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="1432.65" y="-1519.3" font-family="Times,serif" font-size="14.00">RequestOrderOperation</text>
+<text text-anchor="middle" x="1432.65" y="-1502.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="1321.04,-1494.3 1544.26,-1494.3 "/>
+<text text-anchor="start" x="1329.04" y="-1477.7" font-family="Times,serif" font-size="14.00">order: RequestOrder</text>
+<text text-anchor="start" x="1329.04" y="-1460.9" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
+<text text-anchor="start" x="1329.04" y="-1444.1" font-family="Times,serif" font-size="14.00">sign: bytes</text>
 </g>
 <!-- 50&#45;&gt;60 -->
-<g id="edge65" class="edge">
+<g id="edge66" class="edge">
 <title>50&#45;&gt;60</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M838.08,-1289.9C830.7,-1302.12 823.5,-1314.28 816.61,-1326.2 782.91,-1384.51 747.87,-1452.72 724.85,-1501.96"/>
-<polygon fill="black" stroke="black" points="721.58,-1500.69 720.56,-1511.23 727.93,-1503.63 721.58,-1500.69"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1128.61,-1199.13C1188.74,-1235.21 1251.69,-1278.34 1303.65,-1326.2 1335.37,-1355.41 1363.85,-1394.22 1386.05,-1427.09"/>
+<polygon fill="black" stroke="black" points="1383.37,-1429.39 1391.85,-1435.75 1389.19,-1425.5 1383.37,-1429.39"/>
 </g>
 <!-- 51 -->
 <g id="node20" class="node">
 <title>51</title>
-<polygon fill="#f2f2f2" stroke="black" points="728,-1967.7 728,-2067.7 951.22,-2067.7 951.22,-1967.7 728,-1967.7"/>
-<text text-anchor="middle" x="839.61" y="-2051.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Enum&gt;&gt;</text>
-<text text-anchor="middle" x="839.61" y="-2034.3" font-family="Times,serif" font-size="14.00">OrderOperationEnum</text>
-<text text-anchor="middle" x="839.61" y="-2017.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="728,-2009.3 951.22,-2009.3 "/>
-<text text-anchor="start" x="736" y="-1992.7" font-family="Times,serif" font-size="14.00">SIGN: 0</text>
-<text text-anchor="start" x="736" y="-1975.9" font-family="Times,serif" font-size="14.00">CLOSE: 1</text>
+<polygon fill="#f2f2f2" stroke="black" points="940.04,-1892.1 940.04,-1992.1 1163.26,-1992.1 1163.26,-1892.1 940.04,-1892.1"/>
+<text text-anchor="middle" x="1051.65" y="-1975.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Enum&gt;&gt;</text>
+<text text-anchor="middle" x="1051.65" y="-1958.7" font-family="Times,serif" font-size="14.00">OrderOperationEnum</text>
+<text text-anchor="middle" x="1051.65" y="-1941.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="940.04,-1933.7 1163.26,-1933.7 "/>
+<text text-anchor="start" x="948.04" y="-1917.1" font-family="Times,serif" font-size="14.00">SIGN: 0</text>
+<text text-anchor="start" x="948.04" y="-1900.3" font-family="Times,serif" font-size="14.00">CLOSE: 1</text>
 </g>
 <!-- 51&#45;&gt;50 -->
-<g id="edge47" class="edge">
+<g id="edge48" class="edge">
 <title>51&#45;&gt;50</title>
-<path fill="none" stroke="black" d="M838.19,-1967.22C834.69,-1830.14 828.05,-1447.58 858.61,-1326.2 860.67,-1318.03 863.03,-1309.82 865.65,-1301.61"/>
-<polygon fill="black" stroke="black" points="865.73,-1301.4 863.83,-1294.44 869.53,-1290.02 871.42,-1296.98 865.73,-1301.4"/>
+<path fill="none" stroke="black" d="M1057.21,-1891.88C1067.62,-1786.27 1084.57,-1530.93 1032.65,-1326.2 1030.58,-1318.03 1028.2,-1309.83 1025.57,-1301.62"/>
+<polygon fill="black" stroke="black" points="1025.5,-1301.41 1019.8,-1296.99 1021.69,-1290.03 1027.39,-1294.45 1025.5,-1301.41"/>
 </g>
 <!-- 52&#45;&gt;50 -->
-<g id="edge48" class="edge">
+<g id="edge49" class="edge">
 <title>52&#45;&gt;50</title>
-<path fill="none" stroke="black" d="M1195.59,-1502.92C1173.05,-1454.07 1139.39,-1385.93 1109.61,-1326.2 1105.46,-1317.89 1101.23,-1309.41 1096.95,-1300.86"/>
-<polygon fill="black" stroke="black" points="1096.88,-1300.71 1090.61,-1297.13 1091.5,-1289.98 1097.77,-1293.55 1096.88,-1300.71"/>
+<path fill="none" stroke="black" d="M714.91,-1427.1C736.67,-1391.97 764.02,-1346.6 791.35,-1300.47"/>
+<polygon fill="black" stroke="black" points="791.44,-1300.32 791.05,-1293.12 797.55,-1290 797.94,-1297.2 791.44,-1300.32"/>
 </g>
 <!-- 53&#45;&gt;50 -->
-<g id="edge49" class="edge">
+<g id="edge50" class="edge">
 <title>53&#45;&gt;50</title>
-<path fill="none" stroke="black" d="M1382.52,-1908.8C1395.42,-1740.03 1404.97,-1422.87 1350.61,-1326.2 1317.63,-1267.56 1263.72,-1220.57 1207.08,-1184.23"/>
-<polygon fill="black" stroke="black" points="1207.01,-1184.18 1199.8,-1184.37 1196.85,-1177.79 1204.06,-1177.6 1207.01,-1184.18"/>
+<path fill="none" stroke="black" d="M520.95,-1833.15C516.7,-1680.28 511.27,-1409.97 558.65,-1326.2 588.44,-1273.54 635.06,-1230.26 684.78,-1195.65"/>
+<polygon fill="black" stroke="black" points="684.85,-1195.61 687.55,-1188.92 694.76,-1188.84 692.06,-1195.53 684.85,-1195.61"/>
 </g>
 <!-- 54&#45;&gt;50 -->
-<g id="edge50" class="edge">
+<g id="edge51" class="edge">
 <title>54&#45;&gt;50</title>
-<path fill="none" stroke="black" d="M1764.69,-1908.73C1782.13,-1760.33 1784.8,-1492.8 1648.61,-1326.2 1541.6,-1195.3 1356.97,-1135.59 1208.71,-1108.35"/>
-<polygon fill="black" stroke="black" points="1208.56,-1108.32 1201.95,-1111.2 1196.75,-1106.2 1203.36,-1103.32 1208.56,-1108.32"/>
+<path fill="none" stroke="black" d="M1570.61,-1833.18C1593,-1678.98 1617.57,-1405.44 1562.65,-1326.2 1468.58,-1190.46 1287.9,-1131.15 1140.69,-1105.3"/>
+<polygon fill="black" stroke="black" points="1140.64,-1105.29 1134.05,-1108.23 1128.81,-1103.27 1135.4,-1100.34 1140.64,-1105.29"/>
 </g>
 <!-- 55&#45;&gt;50 -->
-<g id="edge51" class="edge">
+<g id="edge52" class="edge">
 <title>55&#45;&gt;50</title>
-<path fill="none" stroke="black" d="M137.04,-1891.93C170.03,-1716.23 231.6,-1408.16 307.61,-1326.2 422.37,-1202.45 604.7,-1142.29 750.52,-1113.06"/>
-<polygon fill="black" stroke="black" points="750.95,-1112.98 756.07,-1107.9 762.73,-1110.67 757.61,-1115.75 750.95,-1112.98"/>
+<path fill="none" stroke="black" d="M169.98,-1816.44C155.62,-1681.15 151.39,-1465.82 260.65,-1326.2 361.73,-1197.04 538.72,-1137.16 682.68,-1109.41"/>
+<polygon fill="black" stroke="black" points="682.95,-1109.36 688.11,-1104.32 694.74,-1107.14 689.58,-1112.18 682.95,-1109.36"/>
 </g>
 <!-- 56&#45;&gt;50 -->
-<g id="edge52" class="edge">
+<g id="edge53" class="edge">
 <title>56&#45;&gt;50</title>
-<path fill="none" stroke="black" d="M333.74,-1849.81C312.95,-1672.85 290.05,-1407.81 346.61,-1326.2 437.46,-1195.12 609.07,-1135.31 750.72,-1108.08"/>
-<polygon fill="black" stroke="black" points="750.8,-1108.07 755.97,-1103.03 762.6,-1105.86 757.44,-1110.9 750.8,-1108.07"/>
+<path fill="none" stroke="black" d="M1761.65,-1774.43C1726.66,-1615.35 1665.23,-1390.63 1602.65,-1326.2 1481.18,-1201.12 1290.82,-1140.91 1140.61,-1112"/>
+<polygon fill="black" stroke="black" points="1140.29,-1111.94 1133.65,-1114.76 1128.5,-1109.72 1135.13,-1106.9 1140.29,-1111.94"/>
 </g>
 <!-- 57&#45;&gt;50 -->
-<g id="edge53" class="edge">
+<g id="edge54" class="edge">
 <title>57&#45;&gt;50</title>
-<path fill="none" stroke="black" d="M984.17,-1511.48C985.81,-1459.32 986.53,-1379 986.33,-1302.11"/>
-<polygon fill="black" stroke="black" points="986.33,-1301.8 982.31,-1295.82 986.29,-1289.8 990.31,-1295.79 986.33,-1301.8"/>
+<path fill="none" stroke="black" d="M916.53,-1435.51C917.68,-1399.8 918.3,-1351.51 918.39,-1302.21"/>
+<polygon fill="black" stroke="black" points="918.39,-1302 914.4,-1295.99 918.4,-1290 922.4,-1296 918.39,-1302"/>
 </g>
 <!-- 57&#45;&gt;51 -->
-<g id="edge67" class="edge">
+<g id="edge68" class="edge">
 <title>57&#45;&gt;51</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M961.45,-1628.72C934.7,-1713.91 884.97,-1872.26 858.06,-1957.96"/>
-<polygon fill="black" stroke="black" points="854.7,-1956.95 855.05,-1967.54 861.38,-1959.05 854.7,-1956.95"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M929.81,-1553.12C956.56,-1638.31 1006.29,-1796.66 1033.21,-1882.36"/>
+<polygon fill="black" stroke="black" points="1029.88,-1883.45 1036.21,-1891.94 1036.56,-1881.35 1029.88,-1883.45"/>
 </g>
 <!-- 57&#45;&gt;53 -->
-<g id="edge66" class="edge">
+<g id="edge67" class="edge">
 <title>57&#45;&gt;53</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M999.28,-1628.49C1019.02,-1680.63 1053.17,-1757.62 1099.61,-1813.6 1141.56,-1864.17 1198.49,-1909.37 1249.26,-1944.22"/>
-<polygon fill="black" stroke="black" points="1247.44,-1947.21 1257.68,-1949.94 1251.38,-1941.42 1247.44,-1947.21"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M873.37,-1552.93C850.74,-1585.87 820.86,-1627.46 791.65,-1662.4 744.81,-1718.44 689.22,-1777 640.69,-1825.9"/>
+<polygon fill="black" stroke="black" points="638.16,-1823.48 633.58,-1833.04 643.12,-1828.42 638.16,-1823.48"/>
 </g>
 <!-- 58&#45;&gt;50 -->
-<g id="edge54" class="edge">
+<g id="edge55" class="edge">
 <title>58&#45;&gt;50</title>
-<path fill="none" stroke="black" d="M1506.29,-1511.28C1488.3,-1458.22 1452.68,-1379.83 1401.61,-1326.2 1347.01,-1268.87 1275.75,-1220.84 1207.37,-1183.15"/>
-<polygon fill="black" stroke="black" points="1206.96,-1182.92 1199.78,-1183.57 1196.42,-1177.18 1203.6,-1176.54 1206.96,-1182.92"/>
+<path fill="none" stroke="black" d="M1156.85,-1435.51C1133.14,-1399.28 1099.98,-1350.07 1065.68,-1300.02"/>
+<polygon fill="black" stroke="black" points="1065.6,-1299.89 1058.91,-1297.21 1058.81,-1290 1065.51,-1292.68 1065.6,-1299.89"/>
 </g>
 <!-- 58&#45;&gt;51 -->
-<g id="edge69" class="edge">
+<g id="edge70" class="edge">
 <title>58&#45;&gt;51</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1489.38,-1628.3C1459.06,-1682.72 1406.95,-1763.41 1341.61,-1813.6 1306.46,-1840.6 1289.79,-1833.22 1248.61,-1849.6 1151.5,-1888.23 1041.91,-1933.07 960.62,-1966.57"/>
-<polygon fill="black" stroke="black" points="959.26,-1963.35 951.35,-1970.39 961.93,-1969.82 959.26,-1963.35"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1173.49,-1553.12C1146.74,-1638.31 1097.01,-1796.66 1070.1,-1882.36"/>
+<polygon fill="black" stroke="black" points="1066.75,-1881.35 1067.09,-1891.94 1073.43,-1883.45 1066.75,-1881.35"/>
 </g>
 <!-- 58&#45;&gt;54 -->
-<g id="edge68" class="edge">
+<g id="edge69" class="edge">
 <title>58&#45;&gt;54</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1547.79,-1628.72C1582.25,-1696.99 1640.41,-1812.24 1684.42,-1899.44"/>
-<polygon fill="black" stroke="black" points="1681.41,-1901.23 1689.04,-1908.58 1687.66,-1898.08 1681.41,-1901.23"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1231.31,-1553.02C1254.15,-1585.62 1283.78,-1626.84 1311.65,-1662.4 1354.5,-1717.06 1404.08,-1775.78 1446.86,-1825.16"/>
+<polygon fill="black" stroke="black" points="1444.47,-1827.75 1453.67,-1833 1449.76,-1823.16 1444.47,-1827.75"/>
 </g>
 <!-- 59&#45;&gt;50 -->
-<g id="edge55" class="edge">
+<g id="edge56" class="edge">
 <title>59&#45;&gt;50</title>
-<path fill="none" stroke="black" d="M483.45,-1511.41C504.22,-1458.45 537.91,-1380.12 587.61,-1326.2 634.14,-1275.72 693.67,-1232.33 752.22,-1196.85"/>
-<polygon fill="black" stroke="black" points="752.46,-1196.71 755.55,-1190.2 762.75,-1190.55 759.66,-1197.06 752.46,-1196.71"/>
+<path fill="none" stroke="black" d="M415.5,-1435.69C439.66,-1401.15 471.93,-1357.93 507.65,-1326.2 560.37,-1279.38 623.59,-1237.13 684.2,-1201.56"/>
+<polygon fill="black" stroke="black" points="684.31,-1201.5 687.49,-1195.02 694.69,-1195.46 691.51,-1201.93 684.31,-1201.5"/>
 </g>
 <!-- 59&#45;&gt;51 -->
-<g id="edge71" class="edge">
+<g id="edge72" class="edge">
 <title>59&#45;&gt;51</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M478.49,-1628.31C498.39,-1680.33 532.63,-1757.24 578.61,-1813.6 626.76,-1872.61 695.09,-1925 749.76,-1961.79"/>
-<polygon fill="black" stroke="black" points="748.14,-1964.92 758.41,-1967.55 752.03,-1959.09 748.14,-1964.92"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M422.68,-1552.78C455.86,-1588.14 501.94,-1632.29 549.65,-1662.4 587.13,-1686.06 602.79,-1679.02 642.65,-1698.4 759.8,-1755.34 887.88,-1834.27 968.93,-1886.46"/>
+<polygon fill="black" stroke="black" points="967.3,-1889.57 977.6,-1892.05 971.1,-1883.69 967.3,-1889.57"/>
 </g>
 <!-- 59&#45;&gt;55 -->
-<g id="edge70" class="edge">
+<g id="edge71" class="edge">
 <title>59&#45;&gt;55</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M409.96,-1628.53C363.27,-1684.32 291.24,-1771.67 231.61,-1849.6 223.14,-1860.66 214.47,-1872.23 205.86,-1883.9"/>
-<polygon fill="black" stroke="black" points="203.01,-1881.86 199.9,-1891.98 208.65,-1886.01 203.01,-1881.86"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M348.4,-1553.12C321.58,-1617.05 277.48,-1722.18 241.95,-1806.89"/>
+<polygon fill="black" stroke="black" points="238.63,-1805.75 237.99,-1816.32 245.09,-1808.46 238.63,-1805.75"/>
 </g>
 <!-- 60&#45;&gt;50 -->
-<g id="edge56" class="edge">
+<g id="edge57" class="edge">
 <title>60&#45;&gt;50</title>
-<path fill="none" stroke="black" d="M734.86,-1511.23C761.35,-1461.55 798.74,-1388.27 834.61,-1326.2 839.51,-1317.73 844.56,-1309.13 849.72,-1300.48"/>
-<polygon fill="black" stroke="black" points="849.89,-1300.19 849.55,-1292.99 856.06,-1289.9 856.41,-1297.11 849.89,-1300.19"/>
+<path fill="none" stroke="black" d="M1407.41,-1435.75C1386.92,-1401.24 1356.2,-1358.02 1321.65,-1326.2 1267.76,-1276.57 1202.05,-1232.02 1139.14,-1195.14"/>
+<polygon fill="black" stroke="black" points="1139.04,-1195.08 1131.85,-1195.53 1128.67,-1189.05 1135.86,-1188.61 1139.04,-1195.08"/>
 </g>
 <!-- 60&#45;&gt;51 -->
-<g id="edge73" class="edge">
+<g id="edge74" class="edge">
 <title>60&#45;&gt;51</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M717.77,-1628.72C744.52,-1713.91 794.25,-1872.26 821.16,-1957.96"/>
-<polygon fill="black" stroke="black" points="817.83,-1959.05 824.17,-1967.54 824.51,-1956.95 817.83,-1959.05"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1394.15,-1552.74C1371.44,-1585.63 1341.56,-1627.21 1312.65,-1662.4 1246.41,-1743.04 1162.93,-1829.9 1108.47,-1884.83"/>
+<polygon fill="black" stroke="black" points="1105.88,-1882.47 1101.32,-1892.03 1110.85,-1887.41 1105.88,-1882.47"/>
 </g>
 <!-- 60&#45;&gt;56 -->
-<g id="edge72" class="edge">
+<g id="edge73" class="edge">
 <title>60&#45;&gt;56</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M678.5,-1628.34C657.95,-1679.85 623.42,-1755.98 579.61,-1813.6 549.06,-1853.79 509.73,-1892.24 472.41,-1924.67"/>
-<polygon fill="black" stroke="black" points="469.78,-1922.32 464.48,-1931.5 474.35,-1927.62 469.78,-1922.32"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1515.63,-1552.7C1565.16,-1590 1626.76,-1642.05 1670.65,-1698.4 1686.66,-1718.95 1701.36,-1741.98 1714.57,-1765.45"/>
+<polygon fill="black" stroke="black" points="1711.65,-1767.4 1719.56,-1774.46 1717.78,-1764.01 1711.65,-1767.4"/>
 </g>
 <!-- 61&#45;&gt;62 -->
-<g id="edge75" class="edge">
+<g id="edge76" class="edge">
 <title>61&#45;&gt;62</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4719.69,-1155.53C4718.54,-1198.76 4717.93,-1257.12 4717.86,-1316.35"/>
-<polygon fill="black" stroke="black" points="4714.36,-1316.64 4717.86,-1326.64 4721.36,-1316.64 4714.36,-1316.64"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3917.58,-1565.45C3916.66,-1599.64 3916.12,-1643.08 3915.96,-1688.18"/>
+<polygon fill="black" stroke="black" points="3912.46,-1688.43 3915.93,-1698.44 3919.46,-1688.45 3912.46,-1688.43"/>
 </g>
 <!-- 62&#45;&gt;24 -->
-<g id="edge78" class="edge">
+<g id="edge79" class="edge">
 <title>62&#45;&gt;24</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4651.73,-1813.37C4635.55,-1867.17 4619.84,-1919.44 4608.4,-1957.51"/>
-<polygon fill="black" stroke="black" points="4604.96,-1956.78 4605.44,-1967.37 4611.67,-1958.8 4604.96,-1956.78"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4021.62,-2185.5C4025.54,-2195.09 4029.26,-2204.21 4032.72,-2212.69"/>
+<polygon fill="black" stroke="black" points="4029.49,-2214.03 4036.51,-2221.97 4035.97,-2211.39 4029.49,-2214.03"/>
 </g>
 <!-- 62&#45;&gt;36 -->
-<g id="edge77" class="edge">
+<g id="edge78" class="edge">
 <title>62&#45;&gt;36</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4985.71,-1746.15C5024.03,-1769.76 5063.45,-1792.93 5101.61,-1813.6 5228.05,-1882.07 5382.11,-1947.41 5474.34,-1984.71"/>
-<polygon fill="black" stroke="black" points="5473.04,-1987.96 5483.62,-1988.45 5475.66,-1981.47 5473.04,-1987.96"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4183.9,-2091.09C4259.72,-2127.93 4344.11,-2163.29 4425.65,-2185.8 4580.7,-2228.61 5045.6,-2255.48 5264.83,-2266.1"/>
+<polygon fill="black" stroke="black" points="5264.92,-2269.61 5275.08,-2266.59 5265.26,-2262.62 5264.92,-2269.61"/>
 </g>
 <!-- 62&#45;&gt;61 -->
-<g id="edge74" class="edge">
+<g id="edge75" class="edge">
 <title>62&#45;&gt;61</title>
-<path fill="none" stroke="black" d="M4731.36,-1326.64C4731.36,-1269.31 4730.85,-1212.03 4729.83,-1167.69"/>
-<polygon fill="black" stroke="black" points="4729.83,-1167.53 4725.68,-1161.63 4729.53,-1155.53 4733.68,-1161.43 4729.83,-1167.53"/>
+<path fill="none" stroke="black" d="M3929.38,-1698.44C3929.28,-1655.03 3928.83,-1612.63 3928.04,-1577.89"/>
+<polygon fill="black" stroke="black" points="3928.02,-1577.44 3923.88,-1571.54 3927.73,-1565.45 3931.88,-1571.35 3928.02,-1577.44"/>
 </g>
-<!-- 63 -->
-<g id="node32" class="node">
-<title>63</title>
-<polygon fill="#f2f2f2" stroke="black" points="4743.88,-1967.7 4743.88,-2067.7 4973.33,-2067.7 4973.33,-1967.7 4743.88,-1967.7"/>
-<text text-anchor="middle" x="4858.61" y="-2051.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
-<text text-anchor="middle" x="4858.61" y="-2034.3" font-family="Times,serif" font-size="14.00">IRegistry</text>
-<text text-anchor="middle" x="4858.61" y="-2017.5" font-family="Times,serif" font-size="14.00">contracts/registries/IRegistry.sol</text>
-<polyline fill="none" stroke="black" points="4743.88,-2009.3 4973.33,-2009.3 "/>
-<text text-anchor="start" x="4751.88" y="-1992.7" font-family="Times,serif" font-size="14.00">External:</text>
-<text text-anchor="start" x="4751.88" y="-1975.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;isRegistered(_entry: address): bool</text>
-</g>
-<!-- 62&#45;&gt;63 -->
-<g id="edge76" class="edge">
-<title>62&#45;&gt;63</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4797.49,-1813.37C4813.66,-1867.17 4829.37,-1919.44 4840.82,-1957.51"/>
-<polygon fill="black" stroke="black" points="4837.55,-1958.8 4843.78,-1967.37 4844.25,-1956.78 4837.55,-1958.8"/>
+<!-- 64 -->
+<g id="node33" class="node">
+<title>64</title>
+<polygon fill="#f2f2f2" stroke="black" points="3673.93,-2222.3 3673.93,-2322.3 3903.38,-2322.3 3903.38,-2222.3 3673.93,-2222.3"/>
+<text text-anchor="middle" x="3788.65" y="-2305.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Interface&gt;&gt;</text>
+<text text-anchor="middle" x="3788.65" y="-2288.9" font-family="Times,serif" font-size="14.00">IRegistry</text>
+<text text-anchor="middle" x="3788.65" y="-2272.1" font-family="Times,serif" font-size="14.00">contracts/registries/IRegistry.sol</text>
+<polyline fill="none" stroke="black" points="3673.93,-2263.9 3903.38,-2263.9 "/>
+<text text-anchor="start" x="3681.93" y="-2247.3" font-family="Times,serif" font-size="14.00">External:</text>
+<text text-anchor="start" x="3681.93" y="-2230.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;isRegistered(_entry: address): bool</text>
+</g>
+<!-- 62&#45;&gt;64 -->
+<g id="edge77" class="edge">
+<title>62&#45;&gt;64</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3823.68,-2185.5C3819.77,-2195.09 3816.04,-2204.21 3812.58,-2212.69"/>
+<polygon fill="black" stroke="black" points="3809.33,-2211.39 3808.79,-2221.97 3815.81,-2214.03 3809.33,-2211.39"/>
+</g>
+<!-- 63&#45;&gt;61 -->
+<g id="edge80" class="edge">
+<title>63&#45;&gt;61</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4043.61,-1185C4016.02,-1255.34 3979.51,-1348.38 3953.85,-1413.78"/>
+<polygon fill="black" stroke="black" points="3950.54,-1412.64 3950.15,-1423.23 3957.06,-1415.2 3950.54,-1412.64"/>
+</g>
+<!-- 63&#45;&gt;62 -->
+<g id="edge81" class="edge">
+<title>63&#45;&gt;62</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4092.24,-1185.07C4100.54,-1301.53 4105.44,-1499.19 4063.65,-1662.4 4061.38,-1671.27 4058.8,-1680.19 4055.95,-1689.1"/>
+<polygon fill="black" stroke="black" points="4052.57,-1688.18 4052.76,-1698.77 4059.21,-1690.37 4052.57,-1688.18"/>
 </g>
 </g>
 </svg>
diff --git a/docs/uml/class-uml-dir-facets.svg b/docs/uml/class-uml-dir-facets.svg
index 0809a3dd8..7518ea546 100644
--- a/docs/uml/class-uml-dir-facets.svg
+++ b/docs/uml/class-uml-dir-facets.svg
@@ -66,34 +66,31 @@
 <!-- 4 -->
 <g id="node5" class="node">
 <title>4</title>
-<polygon fill="#f2f2f2" stroke="black" points="3820.61,-109.7 3820.61,-562.5 4325.31,-562.5 4325.31,-109.7 3820.61,-109.7"/>
-<text text-anchor="middle" x="4072.96" y="-545.9" font-family="Times,serif" font-size="14.00">IexecEscrowTokenFacet</text>
-<text text-anchor="middle" x="4072.96" y="-529.1" font-family="Times,serif" font-size="14.00">contracts/facets/IexecEscrowTokenFacet.sol</text>
-<polyline fill="none" stroke="black" points="3820.61,-520.9 4325.31,-520.9 "/>
-<text text-anchor="start" x="3828.61" y="-504.3" font-family="Times,serif" font-size="14.00">Internal:</text>
-<text text-anchor="start" x="3828.61" y="-487.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_executeOperation(sender: address, data: bytes)</text>
-<text text-anchor="start" x="3828.61" y="-470.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_validateMatchOrders(sender: address, data: bytes)</text>
-<text text-anchor="start" x="3828.61" y="-453.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_deposit(from: address, amount: uint256)</text>
-<text text-anchor="start" x="3828.61" y="-437.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_withdraw(to: address, amount: uint256)</text>
-<text text-anchor="start" x="3828.61" y="-420.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_mint(account: address, amount: uint256)</text>
-<text text-anchor="start" x="3828.61" y="-403.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_burn(account: address, amount: uint256)</text>
-<text text-anchor="start" x="3828.61" y="-386.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_approve(owner: address, spender: address, amount: uint256)</text>
-<text text-anchor="start" x="3828.61" y="-369.9" font-family="Times,serif" font-size="14.00">External:</text>
-<text text-anchor="start" x="3828.61" y="-353.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;payable&gt;&gt; null()</text>
-<text text-anchor="start" x="3828.61" y="-336.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;payable&gt;&gt; null()</text>
-<text text-anchor="start" x="3828.61" y="-319.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;deposit(amount: uint256): bool</text>
-<text text-anchor="start" x="3828.61" y="-302.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;depositFor(amount: uint256, target: address): bool</text>
-<text text-anchor="start" x="3828.61" y="-285.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;depositForArray(amounts: uint256[], targets: address[]): bool</text>
-<text text-anchor="start" x="3828.61" y="-269.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;withdraw(amount: uint256): bool</text>
-<text text-anchor="start" x="3828.61" y="-252.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;withdrawTo(amount: uint256, target: address): bool</text>
-<text text-anchor="start" x="3828.61" y="-235.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;recover(): uint256 &lt;&lt;onlyOwner&gt;&gt;</text>
-<text text-anchor="start" x="3828.61" y="-218.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;receiveApproval(sender: address, amount: uint256, token: address, data: bytes): bool</text>
-<text text-anchor="start" x="3828.61" y="-201.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;transfer(recipient: address, amount: uint256): bool</text>
-<text text-anchor="start" x="3828.61" y="-185.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;approve(spender: address, value: uint256): bool</text>
-<text text-anchor="start" x="3828.61" y="-168.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;approveAndCall(spender: address, value: uint256, extraData: bytes): bool</text>
-<text text-anchor="start" x="3828.61" y="-151.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;transferFrom(sender: address, recipient: address, amount: uint256): bool</text>
-<text text-anchor="start" x="3828.61" y="-134.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;increaseAllowance(spender: address, addedValue: uint256): bool</text>
-<text text-anchor="start" x="3828.61" y="-117.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;decreaseAllowance(spender: address, subtractedValue: uint256): bool</text>
+<polygon fill="#f2f2f2" stroke="black" points="3820.61,-134.9 3820.61,-537.3 4325.31,-537.3 4325.31,-134.9 3820.61,-134.9"/>
+<text text-anchor="middle" x="4072.96" y="-520.7" font-family="Times,serif" font-size="14.00">IexecEscrowTokenFacet</text>
+<text text-anchor="middle" x="4072.96" y="-503.9" font-family="Times,serif" font-size="14.00">contracts/facets/IexecEscrowTokenFacet.sol</text>
+<polyline fill="none" stroke="black" points="3820.61,-495.7 4325.31,-495.7 "/>
+<text text-anchor="start" x="3828.61" y="-479.1" font-family="Times,serif" font-size="14.00">Internal:</text>
+<text text-anchor="start" x="3828.61" y="-462.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_executeOperation(sender: address, data: bytes)</text>
+<text text-anchor="start" x="3828.61" y="-445.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_validateMatchOrders(sender: address, data: bytes)</text>
+<text text-anchor="start" x="3828.61" y="-428.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_deposit(from: address, amount: uint256)</text>
+<text text-anchor="start" x="3828.61" y="-411.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;_withdraw(to: address, amount: uint256)</text>
+<text text-anchor="start" x="3828.61" y="-395.1" font-family="Times,serif" font-size="14.00">External:</text>
+<text text-anchor="start" x="3828.61" y="-378.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;payable&gt;&gt; null()</text>
+<text text-anchor="start" x="3828.61" y="-361.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;payable&gt;&gt; null()</text>
+<text text-anchor="start" x="3828.61" y="-344.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;deposit(amount: uint256): bool</text>
+<text text-anchor="start" x="3828.61" y="-327.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;depositFor(amount: uint256, target: address): bool</text>
+<text text-anchor="start" x="3828.61" y="-311.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;depositForArray(amounts: uint256[], targets: address[]): bool</text>
+<text text-anchor="start" x="3828.61" y="-294.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;withdraw(amount: uint256): bool</text>
+<text text-anchor="start" x="3828.61" y="-277.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;withdrawTo(amount: uint256, target: address): bool</text>
+<text text-anchor="start" x="3828.61" y="-260.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;recover(): uint256 &lt;&lt;onlyOwner&gt;&gt;</text>
+<text text-anchor="start" x="3828.61" y="-243.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;receiveApproval(sender: address, amount: uint256, token: address, data: bytes): bool</text>
+<text text-anchor="start" x="3828.61" y="-227.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;transfer(recipient: address, amount: uint256): bool</text>
+<text text-anchor="start" x="3828.61" y="-210.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;approve(spender: address, value: uint256): bool</text>
+<text text-anchor="start" x="3828.61" y="-193.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;approveAndCall(spender: address, value: uint256, extraData: bytes): bool</text>
+<text text-anchor="start" x="3828.61" y="-176.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;transferFrom(sender: address, recipient: address, amount: uint256): bool</text>
+<text text-anchor="start" x="3828.61" y="-159.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;increaseAllowance(spender: address, addedValue: uint256): bool</text>
+<text text-anchor="start" x="3828.61" y="-143.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;decreaseAllowance(spender: address, subtractedValue: uint256): bool</text>
 </g>
 <!-- 5 -->
 <g id="node6" class="node">
diff --git a/docs/uml/class-uml-dir-libs.svg b/docs/uml/class-uml-dir-libs.svg
index 8b2a0b1e1..7215ddc1d 100644
--- a/docs/uml/class-uml-dir-libs.svg
+++ b/docs/uml/class-uml-dir-libs.svg
@@ -4,791 +4,824 @@
 <!-- Generated by graphviz version 5.0.0 (20220707.1540)
  -->
 <!-- Title: UmlClassDiagram Pages: 1 -->
-<svg width="5898pt" height="1410pt"
- viewBox="0.00 0.00 5897.69 1410.40" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 1406.4)">
+<svg width="5541pt" height="1690pt"
+ viewBox="0.00 0.00 5541.39 1689.80" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 1685.8)">
 <title>UmlClassDiagram</title>
-<polygon fill="white" stroke="transparent" points="-4,4 -4,-1406.4 5893.69,-1406.4 5893.69,4 -4,4"/>
+<polygon fill="white" stroke="transparent" points="-4,4 -4,-1685.8 5537.39,-1685.8 5537.39,4 -4,4"/>
 <!-- 0 -->
 <g id="node1" class="node">
 <title>0</title>
-<polygon fill="#f2f2f2" stroke="black" points="0,-84.5 0,-326.9 1896.16,-326.9 1896.16,-84.5 0,-84.5"/>
-<text text-anchor="middle" x="948.08" y="-310.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
-<text text-anchor="middle" x="948.08" y="-293.5" font-family="Times,serif" font-size="14.00">CommonLib</text>
-<text text-anchor="middle" x="948.08" y="-276.7" font-family="Times,serif" font-size="14.00">contracts/libs/CommonLib.sol</text>
-<polyline fill="none" stroke="black" points="0,-268.5 1896.16,-268.5 "/>
-<text text-anchor="start" x="8" y="-251.9" font-family="Times,serif" font-size="14.00">Private:</text>
-<text text-anchor="start" x="8" y="-235.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;GROUPMEMBER_PURPOSE: uint256</text>
-<polyline fill="none" stroke="black" points="0,-226.9 1896.16,-226.9 "/>
-<text text-anchor="start" x="8" y="-210.3" font-family="Times,serif" font-size="14.00">Internal:</text>
-<text text-anchor="start" x="8" y="-193.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;toTypedDataHash(structHash: bytes32): bytes32</text>
-<text text-anchor="start" x="8" y="-176.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;verifySignatureOfEthSignedMessage(account: address, message: bytes, signature: bytes): bool</text>
-<text text-anchor="start" x="8" y="-159.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;verifySignature(account: address, messageHash: bytes32, signature: bytes): bool</text>
-<text text-anchor="start" x="8" y="-143.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;verifyPresignature(account: address, messageHash: bytes32): bool</text>
-<text text-anchor="start" x="8" y="-126.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;verifySignatureOrPresignature(account: address, messageHash: bytes32, signature: bytes): bool</text>
-<text text-anchor="start" x="8" y="-109.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;isAccountAuthorizedByRestriction(restriction: address, account: address): bool</text>
-<text text-anchor="start" x="8" y="-92.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;computeDealVolume(appOrderVolume: uint256, appOrderTypedDataHash: bytes32, hasDataset: bool, datasetOrderVolume: uint256, datasetOrderTypedDataHash: bytes32, workerpoolOrderVolume: uint256, workerpoolOrderTypedDataHash: bytes32, requestOrderVolume: uint256, requestOrderTypedDataHash: bytes32): uint256</text>
+<polygon fill="#f2f2f2" stroke="black" points="91.71,-447.9 91.71,-690.3 1987.86,-690.3 1987.86,-447.9 91.71,-447.9"/>
+<text text-anchor="middle" x="1039.78" y="-673.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
+<text text-anchor="middle" x="1039.78" y="-656.9" font-family="Times,serif" font-size="14.00">CommonLib</text>
+<text text-anchor="middle" x="1039.78" y="-640.1" font-family="Times,serif" font-size="14.00">contracts/libs/CommonLib.sol</text>
+<polyline fill="none" stroke="black" points="91.71,-631.9 1987.86,-631.9 "/>
+<text text-anchor="start" x="99.71" y="-615.3" font-family="Times,serif" font-size="14.00">Private:</text>
+<text text-anchor="start" x="99.71" y="-598.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;GROUPMEMBER_PURPOSE: uint256</text>
+<polyline fill="none" stroke="black" points="91.71,-590.3 1987.86,-590.3 "/>
+<text text-anchor="start" x="99.71" y="-573.7" font-family="Times,serif" font-size="14.00">Internal:</text>
+<text text-anchor="start" x="99.71" y="-556.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;toTypedDataHash(structHash: bytes32): bytes32</text>
+<text text-anchor="start" x="99.71" y="-540.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;verifySignatureOfEthSignedMessage(account: address, message: bytes, signature: bytes): bool</text>
+<text text-anchor="start" x="99.71" y="-523.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;verifySignature(account: address, messageHash: bytes32, signature: bytes): bool</text>
+<text text-anchor="start" x="99.71" y="-506.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;verifyPresignature(account: address, messageHash: bytes32): bool</text>
+<text text-anchor="start" x="99.71" y="-489.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;verifySignatureOrPresignature(account: address, messageHash: bytes32, signature: bytes): bool</text>
+<text text-anchor="start" x="99.71" y="-472.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;isAccountAuthorizedByRestriction(restriction: address, account: address): bool</text>
+<text text-anchor="start" x="99.71" y="-456.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;computeDealVolume(appOrderVolume: uint256, appOrderTypedDataHash: bytes32, hasDataset: bool, datasetOrderVolume: uint256, datasetOrderTypedDataHash: bytes32, workerpoolOrderVolume: uint256, workerpoolOrderTypedDataHash: bytes32, requestOrderVolume: uint256, requestOrderTypedDataHash: bytes32): uint256</text>
 </g>
 <!-- 27 -->
 <g id="node28" class="node">
 <title>27</title>
-<polygon fill="#f2f2f2" stroke="black" points="1611.63,-544.7 1611.63,-686.3 1876.52,-686.3 1876.52,-544.7 1611.63,-544.7"/>
-<text text-anchor="middle" x="1744.08" y="-669.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
-<text text-anchor="middle" x="1744.08" y="-652.9" font-family="Times,serif" font-size="14.00">PocoStorageLib</text>
-<text text-anchor="middle" x="1744.08" y="-636.1" font-family="Times,serif" font-size="14.00">contracts/libs/PocoStorageLib.sol</text>
-<polyline fill="none" stroke="black" points="1611.63,-627.9 1876.52,-627.9 "/>
-<text text-anchor="start" x="1619.63" y="-611.3" font-family="Times,serif" font-size="14.00">Private:</text>
-<text text-anchor="start" x="1619.63" y="-594.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;POCO_STORAGE_LOCATION: bytes32</text>
-<polyline fill="none" stroke="black" points="1611.63,-586.3 1876.52,-586.3 "/>
-<text text-anchor="start" x="1619.63" y="-569.7" font-family="Times,serif" font-size="14.00">Internal:</text>
-<text text-anchor="start" x="1619.63" y="-552.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;getPocoStorage(): ($: PocoStorage)</text>
+<polygon fill="#f2f2f2" stroke="black" points="1404.34,-824.1 1404.34,-965.7 1669.23,-965.7 1669.23,-824.1 1404.34,-824.1"/>
+<text text-anchor="middle" x="1536.78" y="-949.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
+<text text-anchor="middle" x="1536.78" y="-932.3" font-family="Times,serif" font-size="14.00">PocoStorageLib</text>
+<text text-anchor="middle" x="1536.78" y="-915.5" font-family="Times,serif" font-size="14.00">contracts/libs/PocoStorageLib.sol</text>
+<polyline fill="none" stroke="black" points="1404.34,-907.3 1669.23,-907.3 "/>
+<text text-anchor="start" x="1412.34" y="-890.7" font-family="Times,serif" font-size="14.00">Private:</text>
+<text text-anchor="start" x="1412.34" y="-873.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;POCO_STORAGE_LOCATION: bytes32</text>
+<polyline fill="none" stroke="black" points="1404.34,-865.7 1669.23,-865.7 "/>
+<text text-anchor="start" x="1412.34" y="-849.1" font-family="Times,serif" font-size="14.00">Internal:</text>
+<text text-anchor="start" x="1412.34" y="-832.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;getPocoStorage(): ($: PocoStorage)</text>
 </g>
 <!-- 0&#45;&gt;27 -->
 <g id="edge1" class="edge">
 <title>0&#45;&gt;27</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1182.87,-326.99C1319.06,-396.76 1486.1,-482.34 1602.37,-541.9"/>
-<polygon fill="black" stroke="black" points="1600.85,-545.06 1611.35,-546.5 1604.05,-538.83 1600.85,-545.06"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1224.49,-690.44C1290.29,-733.31 1362.48,-780.34 1420.87,-818.38"/>
+<polygon fill="black" stroke="black" points="1419.09,-821.4 1429.38,-823.92 1422.91,-815.53 1419.09,-821.4"/>
 </g>
 <!-- 28 -->
 <g id="node29" class="node">
 <title>28</title>
-<polygon fill="#f2f2f2" stroke="black" points="1483.11,-820.1 1483.11,-1306.5 2005.05,-1306.5 2005.05,-820.1 1483.11,-820.1"/>
-<text text-anchor="middle" x="1744.08" y="-1289.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="1744.08" y="-1273.1" font-family="Times,serif" font-size="14.00">PocoStorage</text>
-<text text-anchor="middle" x="1744.08" y="-1256.3" font-family="Times,serif" font-size="14.00">contracts/libs/PocoStorageLib.sol</text>
-<polyline fill="none" stroke="black" points="1483.11,-1248.1 2005.05,-1248.1 "/>
-<text text-anchor="start" x="1491.11" y="-1231.5" font-family="Times,serif" font-size="14.00">m_appregistry: IRegistry</text>
-<text text-anchor="start" x="1491.11" y="-1214.7" font-family="Times,serif" font-size="14.00">m_datasetregistry: IRegistry</text>
-<text text-anchor="start" x="1491.11" y="-1197.9" font-family="Times,serif" font-size="14.00">m_workerpoolregistry: IRegistry</text>
-<text text-anchor="start" x="1491.11" y="-1181.1" font-family="Times,serif" font-size="14.00">m_baseToken: IERC20</text>
-<text text-anchor="start" x="1491.11" y="-1164.3" font-family="Times,serif" font-size="14.00">m_name: string</text>
-<text text-anchor="start" x="1491.11" y="-1147.5" font-family="Times,serif" font-size="14.00">m_symbol: string</text>
-<text text-anchor="start" x="1491.11" y="-1130.7" font-family="Times,serif" font-size="14.00">m_decimals: uint8</text>
-<text text-anchor="start" x="1491.11" y="-1113.9" font-family="Times,serif" font-size="14.00">m_totalSupply: uint256</text>
-<text text-anchor="start" x="1491.11" y="-1097.1" font-family="Times,serif" font-size="14.00">m_balances: mapping(address=&gt;uint256)</text>
-<text text-anchor="start" x="1491.11" y="-1080.3" font-family="Times,serif" font-size="14.00">m_frozens: mapping(address=&gt;uint256)</text>
-<text text-anchor="start" x="1491.11" y="-1063.5" font-family="Times,serif" font-size="14.00">m_allowances: mapping(address=&gt;mapping(address=&gt;uint256))</text>
-<text text-anchor="start" x="1491.11" y="-1046.7" font-family="Times,serif" font-size="14.00">m_eip712DomainSeparator: bytes32</text>
-<text text-anchor="start" x="1491.11" y="-1029.9" font-family="Times,serif" font-size="14.00">m_presigned: mapping(bytes32=&gt;address)</text>
-<text text-anchor="start" x="1491.11" y="-1013.1" font-family="Times,serif" font-size="14.00">m_consumed: mapping(bytes32=&gt;uint256)</text>
-<text text-anchor="start" x="1491.11" y="-996.3" font-family="Times,serif" font-size="14.00">m_deals: mapping(bytes32=&gt;IexecLibCore_v5.Deal)</text>
-<text text-anchor="start" x="1491.11" y="-979.5" font-family="Times,serif" font-size="14.00">m_tasks: mapping(bytes32=&gt;IexecLibCore_v5.Task)</text>
-<text text-anchor="start" x="1491.11" y="-962.7" font-family="Times,serif" font-size="14.00">m_consensus: mapping(bytes32=&gt;IexecLibCore_v5.Consensus)</text>
-<text text-anchor="start" x="1491.11" y="-945.9" font-family="Times,serif" font-size="14.00">m_contributions: mapping(bytes32=&gt;mapping(address=&gt;IexecLibCore_v5.Contribution))</text>
-<text text-anchor="start" x="1491.11" y="-929.1" font-family="Times,serif" font-size="14.00">m_workerScores: mapping(address=&gt;uint256)</text>
-<text text-anchor="start" x="1491.11" y="-912.3" font-family="Times,serif" font-size="14.00">m_teebroker: address</text>
-<text text-anchor="start" x="1491.11" y="-895.5" font-family="Times,serif" font-size="14.00">m_callbackgas: uint256</text>
-<text text-anchor="start" x="1491.11" y="-878.7" font-family="Times,serif" font-size="14.00">m_categories: IexecLibCore_v5.Category[]</text>
-<text text-anchor="start" x="1491.11" y="-861.9" font-family="Times,serif" font-size="14.00">m_v3_iexecHub: IexecHubV3Interface</text>
-<text text-anchor="start" x="1491.11" y="-845.1" font-family="Times,serif" font-size="14.00">m_v3_scoreImported: mapping(address=&gt;bool)</text>
-<text text-anchor="start" x="1491.11" y="-828.3" font-family="Times,serif" font-size="14.00">m_dealsBoost: mapping(bytes32=&gt;IexecLibCore_v5.DealBoost)</text>
+<polygon fill="#f2f2f2" stroke="black" points="1275.82,-1099.5 1275.82,-1585.9 1797.75,-1585.9 1797.75,-1099.5 1275.82,-1099.5"/>
+<text text-anchor="middle" x="1536.78" y="-1569.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="1536.78" y="-1552.5" font-family="Times,serif" font-size="14.00">PocoStorage</text>
+<text text-anchor="middle" x="1536.78" y="-1535.7" font-family="Times,serif" font-size="14.00">contracts/libs/PocoStorageLib.sol</text>
+<polyline fill="none" stroke="black" points="1275.82,-1527.5 1797.75,-1527.5 "/>
+<text text-anchor="start" x="1283.82" y="-1510.9" font-family="Times,serif" font-size="14.00">m_appregistry: IRegistry</text>
+<text text-anchor="start" x="1283.82" y="-1494.1" font-family="Times,serif" font-size="14.00">m_datasetregistry: IRegistry</text>
+<text text-anchor="start" x="1283.82" y="-1477.3" font-family="Times,serif" font-size="14.00">m_workerpoolregistry: IRegistry</text>
+<text text-anchor="start" x="1283.82" y="-1460.5" font-family="Times,serif" font-size="14.00">m_baseToken: IERC20</text>
+<text text-anchor="start" x="1283.82" y="-1443.7" font-family="Times,serif" font-size="14.00">m_name: string</text>
+<text text-anchor="start" x="1283.82" y="-1426.9" font-family="Times,serif" font-size="14.00">m_symbol: string</text>
+<text text-anchor="start" x="1283.82" y="-1410.1" font-family="Times,serif" font-size="14.00">m_decimals: uint8</text>
+<text text-anchor="start" x="1283.82" y="-1393.3" font-family="Times,serif" font-size="14.00">m_totalSupply: uint256</text>
+<text text-anchor="start" x="1283.82" y="-1376.5" font-family="Times,serif" font-size="14.00">m_balances: mapping(address=&gt;uint256)</text>
+<text text-anchor="start" x="1283.82" y="-1359.7" font-family="Times,serif" font-size="14.00">m_frozens: mapping(address=&gt;uint256)</text>
+<text text-anchor="start" x="1283.82" y="-1342.9" font-family="Times,serif" font-size="14.00">m_allowances: mapping(address=&gt;mapping(address=&gt;uint256))</text>
+<text text-anchor="start" x="1283.82" y="-1326.1" font-family="Times,serif" font-size="14.00">m_eip712DomainSeparator: bytes32</text>
+<text text-anchor="start" x="1283.82" y="-1309.3" font-family="Times,serif" font-size="14.00">m_presigned: mapping(bytes32=&gt;address)</text>
+<text text-anchor="start" x="1283.82" y="-1292.5" font-family="Times,serif" font-size="14.00">m_consumed: mapping(bytes32=&gt;uint256)</text>
+<text text-anchor="start" x="1283.82" y="-1275.7" font-family="Times,serif" font-size="14.00">m_deals: mapping(bytes32=&gt;IexecLibCore_v5.Deal)</text>
+<text text-anchor="start" x="1283.82" y="-1258.9" font-family="Times,serif" font-size="14.00">m_tasks: mapping(bytes32=&gt;IexecLibCore_v5.Task)</text>
+<text text-anchor="start" x="1283.82" y="-1242.1" font-family="Times,serif" font-size="14.00">m_consensus: mapping(bytes32=&gt;IexecLibCore_v5.Consensus)</text>
+<text text-anchor="start" x="1283.82" y="-1225.3" font-family="Times,serif" font-size="14.00">m_contributions: mapping(bytes32=&gt;mapping(address=&gt;IexecLibCore_v5.Contribution))</text>
+<text text-anchor="start" x="1283.82" y="-1208.5" font-family="Times,serif" font-size="14.00">m_workerScores: mapping(address=&gt;uint256)</text>
+<text text-anchor="start" x="1283.82" y="-1191.7" font-family="Times,serif" font-size="14.00">m_teebroker: address</text>
+<text text-anchor="start" x="1283.82" y="-1174.9" font-family="Times,serif" font-size="14.00">m_callbackgas: uint256</text>
+<text text-anchor="start" x="1283.82" y="-1158.1" font-family="Times,serif" font-size="14.00">m_categories: IexecLibCore_v5.Category[]</text>
+<text text-anchor="start" x="1283.82" y="-1141.3" font-family="Times,serif" font-size="14.00">m_v3_iexecHub: IexecHubV3Interface</text>
+<text text-anchor="start" x="1283.82" y="-1124.5" font-family="Times,serif" font-size="14.00">m_v3_scoreImported: mapping(address=&gt;bool)</text>
+<text text-anchor="start" x="1283.82" y="-1107.7" font-family="Times,serif" font-size="14.00">m_dealsBoost: mapping(bytes32=&gt;IexecLibCore_v5.DealBoost)</text>
 </g>
 <!-- 0&#45;&gt;28 -->
 <g id="edge2" class="edge">
 <title>0&#45;&gt;28</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1060.02,-327.02C1176.67,-452.41 1362.85,-652.53 1511.55,-812.36"/>
-<polygon fill="black" stroke="black" points="1509.22,-815 1518.6,-819.94 1514.35,-810.23 1509.22,-815"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1117.44,-690.66C1186.1,-797.25 1288.47,-956.2 1374.88,-1090.35"/>
+<polygon fill="black" stroke="black" points="1372.19,-1092.64 1380.55,-1099.15 1378.08,-1088.85 1372.19,-1092.64"/>
 </g>
 <!-- 1 -->
 <g id="node2" class="node">
 <title>1</title>
-<polygon fill="#f2f2f2" stroke="black" points="1914.45,-63.3 1914.45,-348.1 2319.71,-348.1 2319.71,-63.3 1914.45,-63.3"/>
-<text text-anchor="middle" x="2117.08" y="-331.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
-<text text-anchor="middle" x="2117.08" y="-314.7" font-family="Times,serif" font-size="14.00">EscrowLib</text>
-<text text-anchor="middle" x="2117.08" y="-297.9" font-family="Times,serif" font-size="14.00">contracts/libs/EscrowLib.sol</text>
-<polyline fill="none" stroke="black" points="1914.45,-289.7 2319.71,-289.7 "/>
-<text text-anchor="start" x="1922.45" y="-273.1" font-family="Times,serif" font-size="14.00">Internal:</text>
-<text text-anchor="start" x="1922.45" y="-256.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;lock(account: address, value: uint256)</text>
-<text text-anchor="start" x="1922.45" y="-239.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;unlock(account: address, value: uint256)</text>
-<text text-anchor="start" x="1922.45" y="-222.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;reward(account: address, value: uint256, ref: bytes32)</text>
-<text text-anchor="start" x="1922.45" y="-205.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;seize(account: address, value: uint256, ref: bytes32)</text>
-<text text-anchor="start" x="1922.45" y="-189.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;rewardAndLock(account: address, value: uint256, ref: bytes32)</text>
-<text text-anchor="start" x="1922.45" y="-172.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;transfer(from: address, to: address, value: uint256)</text>
-<text text-anchor="start" x="1922.45" y="-155.5" font-family="Times,serif" font-size="14.00">Public:</text>
-<text text-anchor="start" x="1922.45" y="-138.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Transfer(from: address, to: address, value: uint256)</text>
-<text text-anchor="start" x="1922.45" y="-121.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Reward(owner: address, amount: uint256, ref: bytes32)</text>
-<text text-anchor="start" x="1922.45" y="-105.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Seize(owner: address, amount: uint256, ref: bytes32)</text>
-<text text-anchor="start" x="1922.45" y="-88.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Lock(owner: address, amount: uint256)</text>
-<text text-anchor="start" x="1922.45" y="-71.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Unlock(owner: address, amount: uint256)</text>
+<polygon fill="#f2f2f2" stroke="black" points="1813.15,-80.1 1813.15,-331.3 2218.42,-331.3 2218.42,-80.1 1813.15,-80.1"/>
+<text text-anchor="middle" x="2015.78" y="-314.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
+<text text-anchor="middle" x="2015.78" y="-297.9" font-family="Times,serif" font-size="14.00">EscrowLib</text>
+<text text-anchor="middle" x="2015.78" y="-281.1" font-family="Times,serif" font-size="14.00">contracts/libs/EscrowLib.sol</text>
+<polyline fill="none" stroke="black" points="1813.15,-272.9 2218.42,-272.9 "/>
+<text text-anchor="start" x="1821.15" y="-256.3" font-family="Times,serif" font-size="14.00">Internal:</text>
+<text text-anchor="start" x="1821.15" y="-239.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;lock(account: address, value: uint256)</text>
+<text text-anchor="start" x="1821.15" y="-222.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;unlock(account: address, value: uint256)</text>
+<text text-anchor="start" x="1821.15" y="-205.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;reward(account: address, value: uint256, ref: bytes32)</text>
+<text text-anchor="start" x="1821.15" y="-189.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;seize(account: address, value: uint256, ref: bytes32)</text>
+<text text-anchor="start" x="1821.15" y="-172.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;rewardAndLock(account: address, value: uint256, ref: bytes32)</text>
+<text text-anchor="start" x="1821.15" y="-155.5" font-family="Times,serif" font-size="14.00">Public:</text>
+<text text-anchor="start" x="1821.15" y="-138.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Reward(owner: address, amount: uint256, ref: bytes32)</text>
+<text text-anchor="start" x="1821.15" y="-121.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Seize(owner: address, amount: uint256, ref: bytes32)</text>
+<text text-anchor="start" x="1821.15" y="-105.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Lock(owner: address, amount: uint256)</text>
+<text text-anchor="start" x="1821.15" y="-88.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Unlock(owner: address, amount: uint256)</text>
 </g>
 <!-- 1&#45;&gt;27 -->
 <g id="edge3" class="edge">
 <title>1&#45;&gt;27</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1987.67,-348.18C1929.69,-411.57 1863.57,-483.86 1814.86,-537.12"/>
-<polygon fill="black" stroke="black" points="1812.27,-534.76 1808.1,-544.5 1817.43,-539.49 1812.27,-534.76"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2027.9,-331.48C2037.19,-456.98 2041.8,-639.1 1996.78,-690.8 1937.19,-759.25 1880.23,-693.55 1795.78,-726.8 1738.6,-749.32 1680.59,-785.26 1634.01,-818.06"/>
+<polygon fill="black" stroke="black" points="1631.87,-815.28 1625.75,-823.93 1635.93,-820.99 1631.87,-815.28"/>
 </g>
 <!-- 1&#45;&gt;28 -->
 <g id="edge4" class="edge">
 <title>1&#45;&gt;28</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2064.04,-348.31C2019.04,-465.98 1951.4,-637.21 1885.08,-783.6 1881.01,-792.58 1876.81,-801.7 1872.51,-810.88"/>
-<polygon fill="black" stroke="black" points="1869.27,-809.54 1868.18,-820.08 1875.6,-812.52 1869.27,-809.54"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1813.09,-217.01C1340.35,-243.11 196.15,-319.04 82.78,-447.4 -300.39,-881.24 747.48,-1173.65 1265.81,-1287.9"/>
+<polygon fill="black" stroke="black" points="1265.16,-1291.34 1275.68,-1290.07 1266.66,-1284.51 1265.16,-1291.34"/>
+</g>
+<!-- 29 -->
+<g id="node30" class="node">
+<title>29</title>
+<polygon fill="#f2f2f2" stroke="black" points="2044.1,-468.7 2044.1,-669.5 2473.46,-669.5 2473.46,-468.7 2044.1,-468.7"/>
+<text text-anchor="middle" x="2258.78" y="-652.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
+<text text-anchor="middle" x="2258.78" y="-636.1" font-family="Times,serif" font-size="14.00">StakedRlcLib</text>
+<text text-anchor="middle" x="2258.78" y="-619.3" font-family="Times,serif" font-size="14.00">contracts/libs/StakedRlcLib.sol</text>
+<polyline fill="none" stroke="black" points="2044.1,-611.1 2473.46,-611.1 "/>
+<text text-anchor="start" x="2052.1" y="-594.5" font-family="Times,serif" font-size="14.00">Internal:</text>
+<text text-anchor="start" x="2052.1" y="-577.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;transfer(from: address, to: address, value: uint256)</text>
+<text text-anchor="start" x="2052.1" y="-560.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;mint(account: address, amount: uint256)</text>
+<text text-anchor="start" x="2052.1" y="-544.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;burn(account: address, amount: uint256)</text>
+<text text-anchor="start" x="2052.1" y="-527.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;approve(owner: address, spender: address, amount: uint256)</text>
+<text text-anchor="start" x="2052.1" y="-510.5" font-family="Times,serif" font-size="14.00">Public:</text>
+<text text-anchor="start" x="2052.1" y="-493.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Transfer(from: address, to: address, value: uint256)</text>
+<text text-anchor="start" x="2052.1" y="-476.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&lt;&lt;event&gt;&gt; Approval(owner: address, spender: address, value: uint256)</text>
+</g>
+<!-- 1&#45;&gt;29 -->
+<g id="edge5" class="edge">
+<title>1&#45;&gt;29</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2099.58,-331.33C2127.7,-373.15 2158.82,-419.43 2186.02,-459.89"/>
+<polygon fill="black" stroke="black" points="2183.28,-462.08 2191.77,-468.43 2189.09,-458.18 2183.28,-462.08"/>
 </g>
 <!-- 2 -->
 <g id="node3" class="node">
 <title>2</title>
-<polygon fill="#f2f2f2" stroke="black" points="3246.91,-1343.5 3246.91,-1401.9 3459.25,-1401.9 3459.25,-1343.5 3246.91,-1343.5"/>
-<text text-anchor="middle" x="3353.08" y="-1385.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
-<text text-anchor="middle" x="3353.08" y="-1368.5" font-family="Times,serif" font-size="14.00">IexecLibCore_v5</text>
-<text text-anchor="middle" x="3353.08" y="-1351.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polygon fill="#f2f2f2" stroke="black" points="3039.62,-1622.9 3039.62,-1681.3 3251.95,-1681.3 3251.95,-1622.9 3039.62,-1622.9"/>
+<text text-anchor="middle" x="3145.78" y="-1664.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
+<text text-anchor="middle" x="3145.78" y="-1647.9" font-family="Times,serif" font-size="14.00">IexecLibCore_v5</text>
+<text text-anchor="middle" x="3145.78" y="-1631.1" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
 </g>
 <!-- 3 -->
 <g id="node4" class="node">
 <title>3</title>
-<polygon fill="#f2f2f2" stroke="black" points="2022.91,-1013.3 2022.91,-1113.3 2235.25,-1113.3 2235.25,-1013.3 2022.91,-1013.3"/>
-<text text-anchor="middle" x="2129.08" y="-1096.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="2129.08" y="-1079.9" font-family="Times,serif" font-size="14.00">Account</text>
-<text text-anchor="middle" x="2129.08" y="-1063.1" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
-<polyline fill="none" stroke="black" points="2022.91,-1054.9 2235.25,-1054.9 "/>
-<text text-anchor="start" x="2030.91" y="-1038.3" font-family="Times,serif" font-size="14.00">stake: uint256</text>
-<text text-anchor="start" x="2030.91" y="-1021.5" font-family="Times,serif" font-size="14.00">locked: uint256</text>
+<polygon fill="#f2f2f2" stroke="black" points="1815.62,-1292.7 1815.62,-1392.7 2027.95,-1392.7 2027.95,-1292.7 1815.62,-1292.7"/>
+<text text-anchor="middle" x="1921.78" y="-1376.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="1921.78" y="-1359.3" font-family="Times,serif" font-size="14.00">Account</text>
+<text text-anchor="middle" x="1921.78" y="-1342.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polyline fill="none" stroke="black" points="1815.62,-1334.3 2027.95,-1334.3 "/>
+<text text-anchor="start" x="1823.62" y="-1317.7" font-family="Times,serif" font-size="14.00">stake: uint256</text>
+<text text-anchor="start" x="1823.62" y="-1300.9" font-family="Times,serif" font-size="14.00">locked: uint256</text>
 </g>
 <!-- 3&#45;&gt;2 -->
-<g id="edge7" class="edge">
+<g id="edge8" class="edge">
 <title>3&#45;&gt;2</title>
-<path fill="none" stroke="black" d="M2137.1,-1113.32C2149.3,-1170.47 2178.46,-1262.75 2244.08,-1307 2324.64,-1361.33 2965.62,-1370.21 3234.75,-1371.54"/>
-<polygon fill="black" stroke="black" points="3234.9,-1371.54 3240.92,-1367.57 3246.9,-1371.59 3240.88,-1375.57 3234.9,-1371.54"/>
+<path fill="none" stroke="black" d="M1929.8,-1392.72C1942,-1449.87 1971.16,-1542.15 2036.78,-1586.4 2117.35,-1640.73 2758.33,-1649.61 3027.46,-1650.94"/>
+<polygon fill="black" stroke="black" points="3027.6,-1650.94 3033.62,-1646.97 3039.6,-1650.99 3033.58,-1654.97 3027.6,-1650.94"/>
 </g>
 <!-- 4 -->
 <g id="node5" class="node">
 <title>4</title>
-<polygon fill="#f2f2f2" stroke="black" points="2252.91,-1004.9 2252.91,-1121.7 2465.25,-1121.7 2465.25,-1004.9 2252.91,-1004.9"/>
-<text text-anchor="middle" x="2359.08" y="-1105.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="2359.08" y="-1088.3" font-family="Times,serif" font-size="14.00">Category</text>
-<text text-anchor="middle" x="2359.08" y="-1071.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
-<polyline fill="none" stroke="black" points="2252.91,-1063.3 2465.25,-1063.3 "/>
-<text text-anchor="start" x="2260.91" y="-1046.7" font-family="Times,serif" font-size="14.00">name: string</text>
-<text text-anchor="start" x="2260.91" y="-1029.9" font-family="Times,serif" font-size="14.00">description: string</text>
-<text text-anchor="start" x="2260.91" y="-1013.1" font-family="Times,serif" font-size="14.00">workClockTimeRef: uint256</text>
+<polygon fill="#f2f2f2" stroke="black" points="2045.62,-1284.3 2045.62,-1401.1 2257.95,-1401.1 2257.95,-1284.3 2045.62,-1284.3"/>
+<text text-anchor="middle" x="2151.78" y="-1384.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="2151.78" y="-1367.7" font-family="Times,serif" font-size="14.00">Category</text>
+<text text-anchor="middle" x="2151.78" y="-1350.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polyline fill="none" stroke="black" points="2045.62,-1342.7 2257.95,-1342.7 "/>
+<text text-anchor="start" x="2053.62" y="-1326.1" font-family="Times,serif" font-size="14.00">name: string</text>
+<text text-anchor="start" x="2053.62" y="-1309.3" font-family="Times,serif" font-size="14.00">description: string</text>
+<text text-anchor="start" x="2053.62" y="-1292.5" font-family="Times,serif" font-size="14.00">workClockTimeRef: uint256</text>
 </g>
 <!-- 4&#45;&gt;2 -->
-<g id="edge8" class="edge">
+<g id="edge9" class="edge">
 <title>4&#45;&gt;2</title>
-<path fill="none" stroke="black" d="M2369.19,-1121.96C2382.55,-1179.24 2412.06,-1264.49 2474.08,-1307 2535.31,-1348.97 3008.79,-1364.49 3234.34,-1369.54"/>
-<polygon fill="black" stroke="black" points="3234.54,-1369.54 3240.62,-1365.68 3246.53,-1369.81 3240.45,-1373.68 3234.54,-1369.54"/>
+<path fill="none" stroke="black" d="M2161.9,-1401.36C2175.25,-1458.64 2204.77,-1543.89 2266.78,-1586.4 2328.01,-1628.37 2801.49,-1643.89 3027.05,-1648.94"/>
+<polygon fill="black" stroke="black" points="3027.24,-1648.94 3033.33,-1645.08 3039.24,-1649.21 3033.15,-1653.08 3027.24,-1648.94"/>
 </g>
 <!-- 5 -->
 <g id="node6" class="node">
 <title>5</title>
-<polygon fill="#f2f2f2" stroke="black" points="2482.91,-996.5 2482.91,-1130.1 2695.25,-1130.1 2695.25,-996.5 2482.91,-996.5"/>
-<text text-anchor="middle" x="2589.08" y="-1113.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="2589.08" y="-1096.7" font-family="Times,serif" font-size="14.00">DatasetInfo</text>
-<text text-anchor="middle" x="2589.08" y="-1079.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
-<polyline fill="none" stroke="black" points="2482.91,-1071.7 2695.25,-1071.7 "/>
-<text text-anchor="start" x="2490.91" y="-1055.1" font-family="Times,serif" font-size="14.00">owner: address</text>
-<text text-anchor="start" x="2490.91" y="-1038.3" font-family="Times,serif" font-size="14.00">m_datasetName: string</text>
-<text text-anchor="start" x="2490.91" y="-1021.5" font-family="Times,serif" font-size="14.00">m_datasetMultiaddr: bytes</text>
-<text text-anchor="start" x="2490.91" y="-1004.7" font-family="Times,serif" font-size="14.00">m_datasetChecksum: bytes32</text>
+<polygon fill="#f2f2f2" stroke="black" points="2275.62,-1275.9 2275.62,-1409.5 2487.95,-1409.5 2487.95,-1275.9 2275.62,-1275.9"/>
+<text text-anchor="middle" x="2381.78" y="-1392.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="2381.78" y="-1376.1" font-family="Times,serif" font-size="14.00">DatasetInfo</text>
+<text text-anchor="middle" x="2381.78" y="-1359.3" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polyline fill="none" stroke="black" points="2275.62,-1351.1 2487.95,-1351.1 "/>
+<text text-anchor="start" x="2283.62" y="-1334.5" font-family="Times,serif" font-size="14.00">owner: address</text>
+<text text-anchor="start" x="2283.62" y="-1317.7" font-family="Times,serif" font-size="14.00">m_datasetName: string</text>
+<text text-anchor="start" x="2283.62" y="-1300.9" font-family="Times,serif" font-size="14.00">m_datasetMultiaddr: bytes</text>
+<text text-anchor="start" x="2283.62" y="-1284.1" font-family="Times,serif" font-size="14.00">m_datasetChecksum: bytes32</text>
 </g>
 <!-- 5&#45;&gt;2 -->
-<g id="edge9" class="edge">
+<g id="edge10" class="edge">
 <title>5&#45;&gt;2</title>
-<path fill="none" stroke="black" d="M2601.56,-1130.32C2615.98,-1186.99 2645.67,-1265.84 2704.08,-1307 2746.39,-1336.81 3059.29,-1357.04 3234.7,-1366.17"/>
-<polygon fill="black" stroke="black" points="3234.84,-1366.18 3241.04,-1362.49 3246.83,-1366.8 3240.63,-1370.48 3234.84,-1366.18"/>
+<path fill="none" stroke="black" d="M2394.26,-1409.72C2408.68,-1466.39 2438.37,-1545.24 2496.78,-1586.4 2539.09,-1616.21 2851.99,-1636.44 3027.4,-1645.57"/>
+<polygon fill="black" stroke="black" points="3027.55,-1645.58 3033.75,-1641.89 3039.53,-1646.2 3033.33,-1649.88 3027.55,-1645.58"/>
 </g>
 <!-- 6 -->
 <g id="node7" class="node">
 <title>6</title>
-<polygon fill="#f2f2f2" stroke="black" points="2712.91,-979.7 2712.91,-1146.9 2925.25,-1146.9 2925.25,-979.7 2712.91,-979.7"/>
-<text text-anchor="middle" x="2819.08" y="-1130.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="2819.08" y="-1113.5" font-family="Times,serif" font-size="14.00">AppInfo</text>
-<text text-anchor="middle" x="2819.08" y="-1096.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
-<polyline fill="none" stroke="black" points="2712.91,-1088.5 2925.25,-1088.5 "/>
-<text text-anchor="start" x="2720.91" y="-1071.9" font-family="Times,serif" font-size="14.00">owner: address</text>
-<text text-anchor="start" x="2720.91" y="-1055.1" font-family="Times,serif" font-size="14.00">m_appName: string</text>
-<text text-anchor="start" x="2720.91" y="-1038.3" font-family="Times,serif" font-size="14.00">m_appType: string</text>
-<text text-anchor="start" x="2720.91" y="-1021.5" font-family="Times,serif" font-size="14.00">m_appMultiaddr: bytes</text>
-<text text-anchor="start" x="2720.91" y="-1004.7" font-family="Times,serif" font-size="14.00">m_appChecksum: bytes32</text>
-<text text-anchor="start" x="2720.91" y="-987.9" font-family="Times,serif" font-size="14.00">m_appMREnclave: bytes</text>
+<polygon fill="#f2f2f2" stroke="black" points="2505.62,-1259.1 2505.62,-1426.3 2717.95,-1426.3 2717.95,-1259.1 2505.62,-1259.1"/>
+<text text-anchor="middle" x="2611.78" y="-1409.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="2611.78" y="-1392.9" font-family="Times,serif" font-size="14.00">AppInfo</text>
+<text text-anchor="middle" x="2611.78" y="-1376.1" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polyline fill="none" stroke="black" points="2505.62,-1367.9 2717.95,-1367.9 "/>
+<text text-anchor="start" x="2513.62" y="-1351.3" font-family="Times,serif" font-size="14.00">owner: address</text>
+<text text-anchor="start" x="2513.62" y="-1334.5" font-family="Times,serif" font-size="14.00">m_appName: string</text>
+<text text-anchor="start" x="2513.62" y="-1317.7" font-family="Times,serif" font-size="14.00">m_appType: string</text>
+<text text-anchor="start" x="2513.62" y="-1300.9" font-family="Times,serif" font-size="14.00">m_appMultiaddr: bytes</text>
+<text text-anchor="start" x="2513.62" y="-1284.1" font-family="Times,serif" font-size="14.00">m_appChecksum: bytes32</text>
+<text text-anchor="start" x="2513.62" y="-1267.3" font-family="Times,serif" font-size="14.00">m_appMREnclave: bytes</text>
 </g>
 <!-- 6&#45;&gt;2 -->
-<g id="edge10" class="edge">
+<g id="edge11" class="edge">
 <title>6&#45;&gt;2</title>
-<path fill="none" stroke="black" d="M2836.98,-1146.94C2853.11,-1201.01 2882.5,-1268.54 2934.08,-1307 2980.45,-1341.58 3127.85,-1358.09 3234.73,-1365.68"/>
-<polygon fill="black" stroke="black" points="3234.93,-1365.69 3241.19,-1362.12 3246.9,-1366.52 3240.64,-1370.1 3234.93,-1365.69"/>
+<path fill="none" stroke="black" d="M2629.68,-1426.34C2645.81,-1480.41 2675.2,-1547.94 2726.78,-1586.4 2773.16,-1620.98 2920.56,-1637.49 3027.44,-1645.08"/>
+<polygon fill="black" stroke="black" points="3027.63,-1645.09 3033.89,-1641.52 3039.6,-1645.92 3033.34,-1649.5 3027.63,-1645.09"/>
 </g>
 <!-- 7 -->
 <g id="node8" class="node">
 <title>7</title>
-<polygon fill="#f2f2f2" stroke="black" points="2943.4,-996.5 2943.4,-1130.1 3190.75,-1130.1 3190.75,-996.5 2943.4,-996.5"/>
-<text text-anchor="middle" x="3067.08" y="-1113.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="3067.08" y="-1096.7" font-family="Times,serif" font-size="14.00">WorkerpoolInfo</text>
-<text text-anchor="middle" x="3067.08" y="-1079.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
-<polyline fill="none" stroke="black" points="2943.4,-1071.7 3190.75,-1071.7 "/>
-<text text-anchor="start" x="2951.4" y="-1055.1" font-family="Times,serif" font-size="14.00">owner: address</text>
-<text text-anchor="start" x="2951.4" y="-1038.3" font-family="Times,serif" font-size="14.00">m_workerpoolDescription: string</text>
-<text text-anchor="start" x="2951.4" y="-1021.5" font-family="Times,serif" font-size="14.00">m_workerStakeRatioPolicy: uint256</text>
-<text text-anchor="start" x="2951.4" y="-1004.7" font-family="Times,serif" font-size="14.00">m_schedulerRewardRatioPolicy: uint256</text>
+<polygon fill="#f2f2f2" stroke="black" points="2736.11,-1275.9 2736.11,-1409.5 2983.46,-1409.5 2983.46,-1275.9 2736.11,-1275.9"/>
+<text text-anchor="middle" x="2859.78" y="-1392.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="2859.78" y="-1376.1" font-family="Times,serif" font-size="14.00">WorkerpoolInfo</text>
+<text text-anchor="middle" x="2859.78" y="-1359.3" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polyline fill="none" stroke="black" points="2736.11,-1351.1 2983.46,-1351.1 "/>
+<text text-anchor="start" x="2744.11" y="-1334.5" font-family="Times,serif" font-size="14.00">owner: address</text>
+<text text-anchor="start" x="2744.11" y="-1317.7" font-family="Times,serif" font-size="14.00">m_workerpoolDescription: string</text>
+<text text-anchor="start" x="2744.11" y="-1300.9" font-family="Times,serif" font-size="14.00">m_workerStakeRatioPolicy: uint256</text>
+<text text-anchor="start" x="2744.11" y="-1284.1" font-family="Times,serif" font-size="14.00">m_schedulerRewardRatioPolicy: uint256</text>
 </g>
 <!-- 7&#45;&gt;2 -->
-<g id="edge11" class="edge">
+<g id="edge12" class="edge">
 <title>7&#45;&gt;2</title>
-<path fill="none" stroke="black" d="M3090.9,-1130.19C3113.21,-1183.89 3151.22,-1258.52 3205.08,-1307 3218.84,-1319.39 3235.35,-1329.69 3252.28,-1338.16"/>
-<polygon fill="black" stroke="black" points="3252.59,-1338.31 3259.73,-1337.28 3263.43,-1343.46 3256.3,-1344.5 3252.59,-1338.31"/>
+<path fill="none" stroke="black" d="M2883.6,-1409.59C2905.91,-1463.29 2943.93,-1537.92 2997.78,-1586.4 3011.55,-1598.79 3028.06,-1609.09 3044.98,-1617.56"/>
+<polygon fill="black" stroke="black" points="3045.3,-1617.71 3052.44,-1616.68 3056.14,-1622.86 3049,-1623.9 3045.3,-1617.71"/>
 </g>
 <!-- 8 -->
 <g id="node9" class="node">
 <title>8</title>
-<polygon fill="#f2f2f2" stroke="black" points="3246.91,-1004.9 3246.91,-1121.7 3459.25,-1121.7 3459.25,-1004.9 3246.91,-1004.9"/>
-<text text-anchor="middle" x="3353.08" y="-1105.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="3353.08" y="-1088.3" font-family="Times,serif" font-size="14.00">Resource</text>
-<text text-anchor="middle" x="3353.08" y="-1071.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
-<polyline fill="none" stroke="black" points="3246.91,-1063.3 3459.25,-1063.3 "/>
-<text text-anchor="start" x="3254.91" y="-1046.7" font-family="Times,serif" font-size="14.00">pointer: address</text>
-<text text-anchor="start" x="3254.91" y="-1029.9" font-family="Times,serif" font-size="14.00">owner: address</text>
-<text text-anchor="start" x="3254.91" y="-1013.1" font-family="Times,serif" font-size="14.00">price: uint256</text>
+<polygon fill="#f2f2f2" stroke="black" points="3039.62,-1284.3 3039.62,-1401.1 3251.95,-1401.1 3251.95,-1284.3 3039.62,-1284.3"/>
+<text text-anchor="middle" x="3145.78" y="-1384.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="3145.78" y="-1367.7" font-family="Times,serif" font-size="14.00">Resource</text>
+<text text-anchor="middle" x="3145.78" y="-1350.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polyline fill="none" stroke="black" points="3039.62,-1342.7 3251.95,-1342.7 "/>
+<text text-anchor="start" x="3047.62" y="-1326.1" font-family="Times,serif" font-size="14.00">pointer: address</text>
+<text text-anchor="start" x="3047.62" y="-1309.3" font-family="Times,serif" font-size="14.00">owner: address</text>
+<text text-anchor="start" x="3047.62" y="-1292.5" font-family="Times,serif" font-size="14.00">price: uint256</text>
 </g>
 <!-- 8&#45;&gt;2 -->
-<g id="edge12" class="edge">
+<g id="edge13" class="edge">
 <title>8&#45;&gt;2</title>
-<path fill="none" stroke="black" d="M3353.08,-1121.76C3353.08,-1182.73 3353.08,-1277.52 3353.08,-1331.13"/>
-<polygon fill="black" stroke="black" points="3353.08,-1331.2 3357.08,-1337.2 3353.08,-1343.2 3349.08,-1337.2 3353.08,-1331.2"/>
+<path fill="none" stroke="black" d="M3145.78,-1401.16C3145.78,-1462.13 3145.78,-1556.92 3145.78,-1610.53"/>
+<polygon fill="black" stroke="black" points="3145.78,-1610.6 3149.78,-1616.6 3145.78,-1622.6 3141.78,-1616.6 3145.78,-1610.6"/>
 </g>
 <!-- 9 -->
 <g id="node10" class="node">
 <title>9</title>
-<polygon fill="#f2f2f2" stroke="black" points="3112.91,-447.9 3112.91,-783.1 3325.25,-783.1 3325.25,-447.9 3112.91,-447.9"/>
-<text text-anchor="middle" x="3219.08" y="-766.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="3219.08" y="-749.7" font-family="Times,serif" font-size="14.00">Deal</text>
-<text text-anchor="middle" x="3219.08" y="-732.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
-<polyline fill="none" stroke="black" points="3112.91,-724.7 3325.25,-724.7 "/>
-<text text-anchor="start" x="3120.91" y="-708.1" font-family="Times,serif" font-size="14.00">app: Resource</text>
-<text text-anchor="start" x="3120.91" y="-691.3" font-family="Times,serif" font-size="14.00">dataset: Resource</text>
-<text text-anchor="start" x="3120.91" y="-674.5" font-family="Times,serif" font-size="14.00">workerpool: Resource</text>
-<text text-anchor="start" x="3120.91" y="-657.7" font-family="Times,serif" font-size="14.00">trust: uint256</text>
-<text text-anchor="start" x="3120.91" y="-640.9" font-family="Times,serif" font-size="14.00">category: uint256</text>
-<text text-anchor="start" x="3120.91" y="-624.1" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
-<text text-anchor="start" x="3120.91" y="-607.3" font-family="Times,serif" font-size="14.00">requester: address</text>
-<text text-anchor="start" x="3120.91" y="-590.5" font-family="Times,serif" font-size="14.00">beneficiary: address</text>
-<text text-anchor="start" x="3120.91" y="-573.7" font-family="Times,serif" font-size="14.00">callback: address</text>
-<text text-anchor="start" x="3120.91" y="-556.9" font-family="Times,serif" font-size="14.00">params: string</text>
-<text text-anchor="start" x="3120.91" y="-540.1" font-family="Times,serif" font-size="14.00">startTime: uint256</text>
-<text text-anchor="start" x="3120.91" y="-523.3" font-family="Times,serif" font-size="14.00">botFirst: uint256</text>
-<text text-anchor="start" x="3120.91" y="-506.5" font-family="Times,serif" font-size="14.00">botSize: uint256</text>
-<text text-anchor="start" x="3120.91" y="-489.7" font-family="Times,serif" font-size="14.00">workerStake: uint256</text>
-<text text-anchor="start" x="3120.91" y="-472.9" font-family="Times,serif" font-size="14.00">schedulerRewardRatio: uint256</text>
-<text text-anchor="start" x="3120.91" y="-456.1" font-family="Times,serif" font-size="14.00">sponsor: address</text>
+<polygon fill="#f2f2f2" stroke="black" points="2905.62,-727.3 2905.62,-1062.5 3117.95,-1062.5 3117.95,-727.3 2905.62,-727.3"/>
+<text text-anchor="middle" x="3011.78" y="-1045.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="3011.78" y="-1029.1" font-family="Times,serif" font-size="14.00">Deal</text>
+<text text-anchor="middle" x="3011.78" y="-1012.3" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polyline fill="none" stroke="black" points="2905.62,-1004.1 3117.95,-1004.1 "/>
+<text text-anchor="start" x="2913.62" y="-987.5" font-family="Times,serif" font-size="14.00">app: Resource</text>
+<text text-anchor="start" x="2913.62" y="-970.7" font-family="Times,serif" font-size="14.00">dataset: Resource</text>
+<text text-anchor="start" x="2913.62" y="-953.9" font-family="Times,serif" font-size="14.00">workerpool: Resource</text>
+<text text-anchor="start" x="2913.62" y="-937.1" font-family="Times,serif" font-size="14.00">trust: uint256</text>
+<text text-anchor="start" x="2913.62" y="-920.3" font-family="Times,serif" font-size="14.00">category: uint256</text>
+<text text-anchor="start" x="2913.62" y="-903.5" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
+<text text-anchor="start" x="2913.62" y="-886.7" font-family="Times,serif" font-size="14.00">requester: address</text>
+<text text-anchor="start" x="2913.62" y="-869.9" font-family="Times,serif" font-size="14.00">beneficiary: address</text>
+<text text-anchor="start" x="2913.62" y="-853.1" font-family="Times,serif" font-size="14.00">callback: address</text>
+<text text-anchor="start" x="2913.62" y="-836.3" font-family="Times,serif" font-size="14.00">params: string</text>
+<text text-anchor="start" x="2913.62" y="-819.5" font-family="Times,serif" font-size="14.00">startTime: uint256</text>
+<text text-anchor="start" x="2913.62" y="-802.7" font-family="Times,serif" font-size="14.00">botFirst: uint256</text>
+<text text-anchor="start" x="2913.62" y="-785.9" font-family="Times,serif" font-size="14.00">botSize: uint256</text>
+<text text-anchor="start" x="2913.62" y="-769.1" font-family="Times,serif" font-size="14.00">workerStake: uint256</text>
+<text text-anchor="start" x="2913.62" y="-752.3" font-family="Times,serif" font-size="14.00">schedulerRewardRatio: uint256</text>
+<text text-anchor="start" x="2913.62" y="-735.5" font-family="Times,serif" font-size="14.00">sponsor: address</text>
 </g>
 <!-- 9&#45;&gt;2 -->
-<g id="edge13" class="edge">
+<g id="edge14" class="edge">
 <title>9&#45;&gt;2</title>
-<path fill="none" stroke="black" d="M3215.16,-783.15C3212.01,-973.18 3211.75,-1263.36 3238.08,-1307 3245.17,-1318.76 3255.25,-1328.56 3266.52,-1336.67"/>
-<polygon fill="black" stroke="black" points="3266.67,-1336.77 3273.88,-1336.73 3276.69,-1343.37 3269.48,-1343.41 3266.67,-1336.77"/>
+<path fill="none" stroke="black" d="M3007.86,-1062.55C3004.71,-1252.58 3004.45,-1542.76 3030.78,-1586.4 3037.88,-1598.16 3047.95,-1607.96 3059.23,-1616.07"/>
+<polygon fill="black" stroke="black" points="3059.38,-1616.17 3066.59,-1616.13 3069.4,-1622.77 3062.19,-1622.81 3059.38,-1616.17"/>
 </g>
 <!-- 9&#45;&gt;8 -->
-<g id="edge18" class="edge">
+<g id="edge19" class="edge">
 <title>9&#45;&gt;8</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3269.17,-783.13C3291.26,-856.62 3315.97,-938.85 3332.82,-994.91"/>
-<polygon fill="black" stroke="black" points="3329.54,-996.15 3335.77,-1004.72 3336.24,-994.13 3329.54,-996.15"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3061.87,-1062.53C3083.96,-1136.02 3108.67,-1218.25 3125.53,-1274.31"/>
+<polygon fill="black" stroke="black" points="3122.24,-1275.55 3128.47,-1284.12 3128.95,-1273.53 3122.24,-1275.55"/>
 </g>
 <!-- 10 -->
 <g id="node11" class="node">
 <title>10</title>
-<polygon fill="#f2f2f2" stroke="black" points="3476.91,-912.5 3476.91,-1214.1 3689.25,-1214.1 3689.25,-912.5 3476.91,-912.5"/>
-<text text-anchor="middle" x="3583.08" y="-1197.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="3583.08" y="-1180.7" font-family="Times,serif" font-size="14.00">DealBoost</text>
-<text text-anchor="middle" x="3583.08" y="-1163.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
-<polyline fill="none" stroke="black" points="3476.91,-1155.7 3689.25,-1155.7 "/>
-<text text-anchor="start" x="3484.91" y="-1139.1" font-family="Times,serif" font-size="14.00">appOwner: address</text>
-<text text-anchor="start" x="3484.91" y="-1122.3" font-family="Times,serif" font-size="14.00">appPrice: uint96</text>
-<text text-anchor="start" x="3484.91" y="-1105.5" font-family="Times,serif" font-size="14.00">datasetOwner: address</text>
-<text text-anchor="start" x="3484.91" y="-1088.7" font-family="Times,serif" font-size="14.00">datasetPrice: uint96</text>
-<text text-anchor="start" x="3484.91" y="-1071.9" font-family="Times,serif" font-size="14.00">workerpoolOwner: address</text>
-<text text-anchor="start" x="3484.91" y="-1055.1" font-family="Times,serif" font-size="14.00">workerpoolPrice: uint96</text>
-<text text-anchor="start" x="3484.91" y="-1038.3" font-family="Times,serif" font-size="14.00">requester: address</text>
-<text text-anchor="start" x="3484.91" y="-1021.5" font-family="Times,serif" font-size="14.00">workerReward: uint96</text>
-<text text-anchor="start" x="3484.91" y="-1004.7" font-family="Times,serif" font-size="14.00">callback: address</text>
-<text text-anchor="start" x="3484.91" y="-987.9" font-family="Times,serif" font-size="14.00">deadline: uint40</text>
-<text text-anchor="start" x="3484.91" y="-971.1" font-family="Times,serif" font-size="14.00">botFirst: uint16</text>
-<text text-anchor="start" x="3484.91" y="-954.3" font-family="Times,serif" font-size="14.00">botSize: uint16</text>
-<text text-anchor="start" x="3484.91" y="-937.5" font-family="Times,serif" font-size="14.00">shortTag: bytes3</text>
-<text text-anchor="start" x="3484.91" y="-920.7" font-family="Times,serif" font-size="14.00">sponsor: address</text>
+<polygon fill="#f2f2f2" stroke="black" points="3269.62,-1191.9 3269.62,-1493.5 3481.95,-1493.5 3481.95,-1191.9 3269.62,-1191.9"/>
+<text text-anchor="middle" x="3375.78" y="-1476.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="3375.78" y="-1460.1" font-family="Times,serif" font-size="14.00">DealBoost</text>
+<text text-anchor="middle" x="3375.78" y="-1443.3" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polyline fill="none" stroke="black" points="3269.62,-1435.1 3481.95,-1435.1 "/>
+<text text-anchor="start" x="3277.62" y="-1418.5" font-family="Times,serif" font-size="14.00">appOwner: address</text>
+<text text-anchor="start" x="3277.62" y="-1401.7" font-family="Times,serif" font-size="14.00">appPrice: uint96</text>
+<text text-anchor="start" x="3277.62" y="-1384.9" font-family="Times,serif" font-size="14.00">datasetOwner: address</text>
+<text text-anchor="start" x="3277.62" y="-1368.1" font-family="Times,serif" font-size="14.00">datasetPrice: uint96</text>
+<text text-anchor="start" x="3277.62" y="-1351.3" font-family="Times,serif" font-size="14.00">workerpoolOwner: address</text>
+<text text-anchor="start" x="3277.62" y="-1334.5" font-family="Times,serif" font-size="14.00">workerpoolPrice: uint96</text>
+<text text-anchor="start" x="3277.62" y="-1317.7" font-family="Times,serif" font-size="14.00">requester: address</text>
+<text text-anchor="start" x="3277.62" y="-1300.9" font-family="Times,serif" font-size="14.00">workerReward: uint96</text>
+<text text-anchor="start" x="3277.62" y="-1284.1" font-family="Times,serif" font-size="14.00">callback: address</text>
+<text text-anchor="start" x="3277.62" y="-1267.3" font-family="Times,serif" font-size="14.00">deadline: uint40</text>
+<text text-anchor="start" x="3277.62" y="-1250.5" font-family="Times,serif" font-size="14.00">botFirst: uint16</text>
+<text text-anchor="start" x="3277.62" y="-1233.7" font-family="Times,serif" font-size="14.00">botSize: uint16</text>
+<text text-anchor="start" x="3277.62" y="-1216.9" font-family="Times,serif" font-size="14.00">shortTag: bytes3</text>
+<text text-anchor="start" x="3277.62" y="-1200.1" font-family="Times,serif" font-size="14.00">sponsor: address</text>
 </g>
 <!-- 10&#45;&gt;2 -->
-<g id="edge14" class="edge">
+<g id="edge15" class="edge">
 <title>10&#45;&gt;2</title>
-<path fill="none" stroke="black" d="M3529.73,-1214.24C3513.37,-1247.27 3492.96,-1280.31 3468.08,-1307 3457.25,-1318.62 3443.85,-1328.69 3430.07,-1337.19"/>
-<polygon fill="black" stroke="black" points="3429.84,-1337.33 3426.69,-1343.81 3419.49,-1343.4 3422.64,-1336.91 3429.84,-1337.33"/>
+<path fill="none" stroke="black" d="M3322.43,-1493.64C3306.08,-1526.67 3285.66,-1559.71 3260.78,-1586.4 3249.95,-1598.02 3236.55,-1608.09 3222.77,-1616.59"/>
+<polygon fill="black" stroke="black" points="3222.55,-1616.73 3219.4,-1623.21 3212.2,-1622.8 3215.35,-1616.31 3222.55,-1616.73"/>
 </g>
 <!-- 11 -->
 <g id="node12" class="node">
 <title>11</title>
-<polygon fill="#f2f2f2" stroke="black" points="3744.91,-988.1 3744.91,-1138.5 3957.25,-1138.5 3957.25,-988.1 3744.91,-988.1"/>
-<text text-anchor="middle" x="3851.08" y="-1121.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Enum&gt;&gt;</text>
-<text text-anchor="middle" x="3851.08" y="-1105.1" font-family="Times,serif" font-size="14.00">TaskStatusEnum</text>
-<text text-anchor="middle" x="3851.08" y="-1088.3" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
-<polyline fill="none" stroke="black" points="3744.91,-1080.1 3957.25,-1080.1 "/>
-<text text-anchor="start" x="3752.91" y="-1063.5" font-family="Times,serif" font-size="14.00">UNSET: 0</text>
-<text text-anchor="start" x="3752.91" y="-1046.7" font-family="Times,serif" font-size="14.00">ACTIVE: 1</text>
-<text text-anchor="start" x="3752.91" y="-1029.9" font-family="Times,serif" font-size="14.00">REVEALING: 2</text>
-<text text-anchor="start" x="3752.91" y="-1013.1" font-family="Times,serif" font-size="14.00">COMPLETED: 3</text>
-<text text-anchor="start" x="3752.91" y="-996.3" font-family="Times,serif" font-size="14.00">FAILED: 4</text>
+<polygon fill="#f2f2f2" stroke="black" points="3537.62,-1267.5 3537.62,-1417.9 3749.95,-1417.9 3749.95,-1267.5 3537.62,-1267.5"/>
+<text text-anchor="middle" x="3643.78" y="-1401.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Enum&gt;&gt;</text>
+<text text-anchor="middle" x="3643.78" y="-1384.5" font-family="Times,serif" font-size="14.00">TaskStatusEnum</text>
+<text text-anchor="middle" x="3643.78" y="-1367.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polyline fill="none" stroke="black" points="3537.62,-1359.5 3749.95,-1359.5 "/>
+<text text-anchor="start" x="3545.62" y="-1342.9" font-family="Times,serif" font-size="14.00">UNSET: 0</text>
+<text text-anchor="start" x="3545.62" y="-1326.1" font-family="Times,serif" font-size="14.00">ACTIVE: 1</text>
+<text text-anchor="start" x="3545.62" y="-1309.3" font-family="Times,serif" font-size="14.00">REVEALING: 2</text>
+<text text-anchor="start" x="3545.62" y="-1292.5" font-family="Times,serif" font-size="14.00">COMPLETED: 3</text>
+<text text-anchor="start" x="3545.62" y="-1275.7" font-family="Times,serif" font-size="14.00">FAILED: 4</text>
 </g>
 <!-- 11&#45;&gt;2 -->
-<g id="edge5" class="edge">
+<g id="edge6" class="edge">
 <title>11&#45;&gt;2</title>
-<path fill="none" stroke="black" d="M3833.78,-1138.64C3816.96,-1193.81 3785.72,-1266.27 3731.08,-1307 3690.83,-1337 3566.83,-1354.11 3471.72,-1363.1"/>
-<polygon fill="black" stroke="black" points="3471.64,-1363.11 3466.03,-1367.64 3459.69,-1364.21 3465.29,-1359.68 3471.64,-1363.11"/>
+<path fill="none" stroke="black" d="M3626.49,-1418.04C3609.67,-1473.21 3578.43,-1545.67 3523.78,-1586.4 3483.53,-1616.4 3359.54,-1633.51 3264.43,-1642.5"/>
+<polygon fill="black" stroke="black" points="3264.34,-1642.51 3258.73,-1647.04 3252.39,-1643.61 3258,-1639.08 3264.34,-1642.51"/>
 </g>
 <!-- 12 -->
 <g id="node13" class="node">
 <title>12</title>
-<polygon fill="#f2f2f2" stroke="black" points="3610.91,-456.3 3610.91,-774.7 3823.25,-774.7 3823.25,-456.3 3610.91,-456.3"/>
-<text text-anchor="middle" x="3717.08" y="-758.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="3717.08" y="-741.3" font-family="Times,serif" font-size="14.00">Task</text>
-<text text-anchor="middle" x="3717.08" y="-724.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
-<polyline fill="none" stroke="black" points="3610.91,-716.3 3823.25,-716.3 "/>
-<text text-anchor="start" x="3618.91" y="-699.7" font-family="Times,serif" font-size="14.00">status: TaskStatusEnum</text>
-<text text-anchor="start" x="3618.91" y="-682.9" font-family="Times,serif" font-size="14.00">dealid: bytes32</text>
-<text text-anchor="start" x="3618.91" y="-666.1" font-family="Times,serif" font-size="14.00">idx: uint256</text>
-<text text-anchor="start" x="3618.91" y="-649.3" font-family="Times,serif" font-size="14.00">timeref: uint256</text>
-<text text-anchor="start" x="3618.91" y="-632.5" font-family="Times,serif" font-size="14.00">contributionDeadline: uint256</text>
-<text text-anchor="start" x="3618.91" y="-615.7" font-family="Times,serif" font-size="14.00">revealDeadline: uint256</text>
-<text text-anchor="start" x="3618.91" y="-598.9" font-family="Times,serif" font-size="14.00">finalDeadline: uint256</text>
-<text text-anchor="start" x="3618.91" y="-582.1" font-family="Times,serif" font-size="14.00">consensusValue: bytes32</text>
-<text text-anchor="start" x="3618.91" y="-565.3" font-family="Times,serif" font-size="14.00">revealCounter: uint256</text>
-<text text-anchor="start" x="3618.91" y="-548.5" font-family="Times,serif" font-size="14.00">winnerCounter: uint256</text>
-<text text-anchor="start" x="3618.91" y="-531.7" font-family="Times,serif" font-size="14.00">contributors: address[]</text>
-<text text-anchor="start" x="3618.91" y="-514.9" font-family="Times,serif" font-size="14.00">resultDigest: bytes32</text>
-<text text-anchor="start" x="3618.91" y="-498.1" font-family="Times,serif" font-size="14.00">results: bytes</text>
-<text text-anchor="start" x="3618.91" y="-481.3" font-family="Times,serif" font-size="14.00">resultsTimestamp: uint256</text>
-<text text-anchor="start" x="3618.91" y="-464.5" font-family="Times,serif" font-size="14.00">resultsCallback: bytes</text>
+<polygon fill="#f2f2f2" stroke="black" points="3403.62,-735.7 3403.62,-1054.1 3615.95,-1054.1 3615.95,-735.7 3403.62,-735.7"/>
+<text text-anchor="middle" x="3509.78" y="-1037.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="3509.78" y="-1020.7" font-family="Times,serif" font-size="14.00">Task</text>
+<text text-anchor="middle" x="3509.78" y="-1003.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polyline fill="none" stroke="black" points="3403.62,-995.7 3615.95,-995.7 "/>
+<text text-anchor="start" x="3411.62" y="-979.1" font-family="Times,serif" font-size="14.00">status: TaskStatusEnum</text>
+<text text-anchor="start" x="3411.62" y="-962.3" font-family="Times,serif" font-size="14.00">dealid: bytes32</text>
+<text text-anchor="start" x="3411.62" y="-945.5" font-family="Times,serif" font-size="14.00">idx: uint256</text>
+<text text-anchor="start" x="3411.62" y="-928.7" font-family="Times,serif" font-size="14.00">timeref: uint256</text>
+<text text-anchor="start" x="3411.62" y="-911.9" font-family="Times,serif" font-size="14.00">contributionDeadline: uint256</text>
+<text text-anchor="start" x="3411.62" y="-895.1" font-family="Times,serif" font-size="14.00">revealDeadline: uint256</text>
+<text text-anchor="start" x="3411.62" y="-878.3" font-family="Times,serif" font-size="14.00">finalDeadline: uint256</text>
+<text text-anchor="start" x="3411.62" y="-861.5" font-family="Times,serif" font-size="14.00">consensusValue: bytes32</text>
+<text text-anchor="start" x="3411.62" y="-844.7" font-family="Times,serif" font-size="14.00">revealCounter: uint256</text>
+<text text-anchor="start" x="3411.62" y="-827.9" font-family="Times,serif" font-size="14.00">winnerCounter: uint256</text>
+<text text-anchor="start" x="3411.62" y="-811.1" font-family="Times,serif" font-size="14.00">contributors: address[]</text>
+<text text-anchor="start" x="3411.62" y="-794.3" font-family="Times,serif" font-size="14.00">resultDigest: bytes32</text>
+<text text-anchor="start" x="3411.62" y="-777.5" font-family="Times,serif" font-size="14.00">results: bytes</text>
+<text text-anchor="start" x="3411.62" y="-760.7" font-family="Times,serif" font-size="14.00">resultsTimestamp: uint256</text>
+<text text-anchor="start" x="3411.62" y="-743.9" font-family="Times,serif" font-size="14.00">resultsCallback: bytes</text>
 </g>
 <!-- 12&#45;&gt;2 -->
-<g id="edge15" class="edge">
+<g id="edge16" class="edge">
 <title>12&#45;&gt;2</title>
-<path fill="none" stroke="black" d="M3723,-774.74C3728.59,-966.08 3731.75,-1267.55 3698.08,-1307 3669,-1341.07 3559.57,-1357.35 3471.65,-1365.03"/>
-<polygon fill="black" stroke="black" points="3471.63,-1365.03 3465.99,-1369.52 3459.67,-1366.04 3465.32,-1361.55 3471.63,-1365.03"/>
+<path fill="none" stroke="black" d="M3515.7,-1054.14C3521.29,-1245.48 3524.45,-1546.95 3490.78,-1586.4 3461.71,-1620.47 3352.28,-1636.75 3264.36,-1644.43"/>
+<polygon fill="black" stroke="black" points="3264.34,-1644.43 3258.69,-1648.92 3252.38,-1645.44 3258.02,-1640.95 3264.34,-1644.43"/>
 </g>
 <!-- 12&#45;&gt;11 -->
-<g id="edge19" class="edge">
+<g id="edge20" class="edge">
 <title>12&#45;&gt;11</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3764.7,-774.93C3785.32,-843.54 3808.62,-921.06 3825.82,-978.28"/>
-<polygon fill="black" stroke="black" points="3822.52,-979.44 3828.75,-988 3829.22,-977.42 3822.52,-979.44"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3557.4,-1054.33C3578.03,-1122.94 3601.33,-1200.46 3618.53,-1257.68"/>
+<polygon fill="black" stroke="black" points="3615.22,-1258.84 3621.45,-1267.4 3621.92,-1256.82 3615.22,-1258.84"/>
 </g>
 <!-- 13 -->
 <g id="node14" class="node">
 <title>13</title>
-<polygon fill="#f2f2f2" stroke="black" points="3974.83,-1013.3 3974.83,-1113.3 4191.32,-1113.3 4191.32,-1013.3 3974.83,-1013.3"/>
-<text text-anchor="middle" x="4083.08" y="-1096.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="4083.08" y="-1079.9" font-family="Times,serif" font-size="14.00">Consensus</text>
-<text text-anchor="middle" x="4083.08" y="-1063.1" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
-<polyline fill="none" stroke="black" points="3974.83,-1054.9 4191.32,-1054.9 "/>
-<text text-anchor="start" x="3982.83" y="-1038.3" font-family="Times,serif" font-size="14.00">group: mapping(bytes32=&gt;uint256)</text>
-<text text-anchor="start" x="3982.83" y="-1021.5" font-family="Times,serif" font-size="14.00">total: uint256</text>
+<polygon fill="#f2f2f2" stroke="black" points="3767.54,-1292.7 3767.54,-1392.7 3984.03,-1392.7 3984.03,-1292.7 3767.54,-1292.7"/>
+<text text-anchor="middle" x="3875.78" y="-1376.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="3875.78" y="-1359.3" font-family="Times,serif" font-size="14.00">Consensus</text>
+<text text-anchor="middle" x="3875.78" y="-1342.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polyline fill="none" stroke="black" points="3767.54,-1334.3 3984.03,-1334.3 "/>
+<text text-anchor="start" x="3775.54" y="-1317.7" font-family="Times,serif" font-size="14.00">group: mapping(bytes32=&gt;uint256)</text>
+<text text-anchor="start" x="3775.54" y="-1300.9" font-family="Times,serif" font-size="14.00">total: uint256</text>
 </g>
 <!-- 13&#45;&gt;2 -->
-<g id="edge16" class="edge">
+<g id="edge17" class="edge">
 <title>13&#45;&gt;2</title>
-<path fill="none" stroke="black" d="M4074.18,-1113.32C4061.09,-1170.03 4030.81,-1261.43 3966.08,-1307 3888.92,-1361.32 3627.17,-1371.5 3471.77,-1372.58"/>
-<polygon fill="black" stroke="black" points="3471.38,-1372.58 3465.4,-1376.62 3459.38,-1372.65 3465.36,-1368.62 3471.38,-1372.58"/>
+<path fill="none" stroke="black" d="M3866.88,-1392.72C3853.8,-1449.43 3823.52,-1540.83 3758.78,-1586.4 3681.62,-1640.72 3419.88,-1650.9 3264.47,-1651.98"/>
+<polygon fill="black" stroke="black" points="3264.09,-1651.98 3258.11,-1656.02 3252.09,-1652.05 3258.07,-1648.02 3264.09,-1651.98"/>
 </g>
 <!-- 14 -->
 <g id="node15" class="node">
 <title>14</title>
-<polygon fill="#f2f2f2" stroke="black" points="4246.91,-996.5 4246.91,-1130.1 4459.25,-1130.1 4459.25,-996.5 4246.91,-996.5"/>
-<text text-anchor="middle" x="4353.08" y="-1113.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Enum&gt;&gt;</text>
-<text text-anchor="middle" x="4353.08" y="-1096.7" font-family="Times,serif" font-size="14.00">ContributionStatusEnum</text>
-<text text-anchor="middle" x="4353.08" y="-1079.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
-<polyline fill="none" stroke="black" points="4246.91,-1071.7 4459.25,-1071.7 "/>
-<text text-anchor="start" x="4254.91" y="-1055.1" font-family="Times,serif" font-size="14.00">UNSET: 0</text>
-<text text-anchor="start" x="4254.91" y="-1038.3" font-family="Times,serif" font-size="14.00">CONTRIBUTED: 1</text>
-<text text-anchor="start" x="4254.91" y="-1021.5" font-family="Times,serif" font-size="14.00">PROVED: 2</text>
-<text text-anchor="start" x="4254.91" y="-1004.7" font-family="Times,serif" font-size="14.00">REJECTED: 3</text>
+<polygon fill="#f2f2f2" stroke="black" points="4039.62,-1275.9 4039.62,-1409.5 4251.95,-1409.5 4251.95,-1275.9 4039.62,-1275.9"/>
+<text text-anchor="middle" x="4145.78" y="-1392.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Enum&gt;&gt;</text>
+<text text-anchor="middle" x="4145.78" y="-1376.1" font-family="Times,serif" font-size="14.00">ContributionStatusEnum</text>
+<text text-anchor="middle" x="4145.78" y="-1359.3" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polyline fill="none" stroke="black" points="4039.62,-1351.1 4251.95,-1351.1 "/>
+<text text-anchor="start" x="4047.62" y="-1334.5" font-family="Times,serif" font-size="14.00">UNSET: 0</text>
+<text text-anchor="start" x="4047.62" y="-1317.7" font-family="Times,serif" font-size="14.00">CONTRIBUTED: 1</text>
+<text text-anchor="start" x="4047.62" y="-1300.9" font-family="Times,serif" font-size="14.00">PROVED: 2</text>
+<text text-anchor="start" x="4047.62" y="-1284.1" font-family="Times,serif" font-size="14.00">REJECTED: 3</text>
 </g>
 <!-- 14&#45;&gt;2 -->
-<g id="edge6" class="edge">
+<g id="edge7" class="edge">
 <title>14&#45;&gt;2</title>
-<path fill="none" stroke="black" d="M4339.63,-1130.21C4324.25,-1187.22 4293.03,-1266.64 4233.08,-1307 4171.39,-1348.53 3696.99,-1364.28 3471.46,-1369.47"/>
-<polygon fill="black" stroke="black" points="3471.27,-1369.47 3465.36,-1373.61 3459.27,-1369.74 3465.18,-1365.61 3471.27,-1369.47"/>
+<path fill="none" stroke="black" d="M4132.34,-1409.61C4116.96,-1466.62 4085.73,-1546.04 4025.78,-1586.4 3964.09,-1627.93 3489.7,-1643.68 3264.17,-1648.87"/>
+<polygon fill="black" stroke="black" points="3263.97,-1648.87 3258.06,-1653.01 3251.97,-1649.14 3257.88,-1645.01 3263.97,-1648.87"/>
 </g>
 <!-- 15 -->
 <g id="node16" class="node">
 <title>15</title>
-<polygon fill="#f2f2f2" stroke="black" points="4112.91,-540.3 4112.91,-690.7 4325.25,-690.7 4325.25,-540.3 4112.91,-540.3"/>
-<text text-anchor="middle" x="4219.08" y="-674.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="4219.08" y="-657.3" font-family="Times,serif" font-size="14.00">Contribution</text>
-<text text-anchor="middle" x="4219.08" y="-640.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
-<polyline fill="none" stroke="black" points="4112.91,-632.3 4325.25,-632.3 "/>
-<text text-anchor="start" x="4120.91" y="-615.7" font-family="Times,serif" font-size="14.00">status: ContributionStatusEnum</text>
-<text text-anchor="start" x="4120.91" y="-598.9" font-family="Times,serif" font-size="14.00">resultHash: bytes32</text>
-<text text-anchor="start" x="4120.91" y="-582.1" font-family="Times,serif" font-size="14.00">resultSeal: bytes32</text>
-<text text-anchor="start" x="4120.91" y="-565.3" font-family="Times,serif" font-size="14.00">enclaveChallenge: address</text>
-<text text-anchor="start" x="4120.91" y="-548.5" font-family="Times,serif" font-size="14.00">weight: uint256</text>
+<polygon fill="#f2f2f2" stroke="black" points="3905.62,-819.7 3905.62,-970.1 4117.95,-970.1 4117.95,-819.7 3905.62,-819.7"/>
+<text text-anchor="middle" x="4011.78" y="-953.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="4011.78" y="-936.7" font-family="Times,serif" font-size="14.00">Contribution</text>
+<text text-anchor="middle" x="4011.78" y="-919.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibCore_v5.sol</text>
+<polyline fill="none" stroke="black" points="3905.62,-911.7 4117.95,-911.7 "/>
+<text text-anchor="start" x="3913.62" y="-895.1" font-family="Times,serif" font-size="14.00">status: ContributionStatusEnum</text>
+<text text-anchor="start" x="3913.62" y="-878.3" font-family="Times,serif" font-size="14.00">resultHash: bytes32</text>
+<text text-anchor="start" x="3913.62" y="-861.5" font-family="Times,serif" font-size="14.00">resultSeal: bytes32</text>
+<text text-anchor="start" x="3913.62" y="-844.7" font-family="Times,serif" font-size="14.00">enclaveChallenge: address</text>
+<text text-anchor="start" x="3913.62" y="-827.9" font-family="Times,serif" font-size="14.00">weight: uint256</text>
 </g>
 <!-- 15&#45;&gt;2 -->
-<g id="edge17" class="edge">
+<g id="edge18" class="edge">
 <title>15&#45;&gt;2</title>
-<path fill="none" stroke="black" d="M4222.51,-690.8C4229.57,-860.08 4241.77,-1263.23 4200.08,-1307 4150.92,-1358.62 3692.88,-1369.17 3471.62,-1371.25"/>
-<polygon fill="black" stroke="black" points="3471.33,-1371.25 3465.36,-1375.3 3459.33,-1371.36 3465.29,-1367.3 3471.33,-1371.25"/>
+<path fill="none" stroke="black" d="M4015.22,-970.2C4022.28,-1139.48 4034.47,-1542.63 3992.78,-1586.4 3943.62,-1638.02 3485.58,-1648.57 3264.32,-1650.65"/>
+<polygon fill="black" stroke="black" points="3264.03,-1650.65 3258.07,-1654.7 3252.03,-1650.76 3258,-1646.7 3264.03,-1650.65"/>
 </g>
 <!-- 15&#45;&gt;14 -->
-<g id="edge20" class="edge">
+<g id="edge21" class="edge">
 <title>15&#45;&gt;14</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4241.43,-690.87C4266.08,-772.87 4305.53,-904.11 4330.34,-986.64"/>
-<polygon fill="black" stroke="black" points="4327.05,-987.88 4333.29,-996.45 4333.76,-985.87 4327.05,-987.88"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4034.14,-970.27C4058.79,-1052.27 4098.24,-1183.51 4123.04,-1266.04"/>
+<polygon fill="black" stroke="black" points="4119.76,-1267.28 4125.99,-1275.85 4126.46,-1265.27 4119.76,-1267.28"/>
 </g>
 <!-- 16 -->
 <g id="node17" class="node">
 <title>16</title>
-<polygon fill="#f2f2f2" stroke="black" points="4965.31,-0.5 4965.31,-410.9 5398.84,-410.9 5398.84,-0.5 4965.31,-0.5"/>
-<text text-anchor="middle" x="5182.08" y="-394.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
-<text text-anchor="middle" x="5182.08" y="-377.5" font-family="Times,serif" font-size="14.00">IexecLibOrders_v5</text>
-<text text-anchor="middle" x="5182.08" y="-360.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="4965.31,-352.5 5398.84,-352.5 "/>
-<text text-anchor="start" x="4973.31" y="-335.9" font-family="Times,serif" font-size="14.00">Public:</text>
-<text text-anchor="start" x="4973.31" y="-319.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;EIP712DOMAIN_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="4973.31" y="-302.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;APPORDER_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="4973.31" y="-285.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;DATASETORDER_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="4973.31" y="-268.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;WORKERPOOLORDER_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="4973.31" y="-251.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;REQUESTORDER_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="4973.31" y="-235.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;APPORDEROPERATION_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="4973.31" y="-218.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;DATASETORDEROPERATION_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="4973.31" y="-201.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;WORKERPOOLORDEROPERATION_TYPEHASH: bytes32</text>
-<text text-anchor="start" x="4973.31" y="-184.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;REQUESTORDEROPERATION_TYPEHASH: bytes32</text>
-<polyline fill="none" stroke="black" points="4965.31,-176.5 5398.84,-176.5 "/>
-<text text-anchor="start" x="4973.31" y="-159.9" font-family="Times,serif" font-size="14.00">Public:</text>
-<text text-anchor="start" x="4973.31" y="-143.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_domain: EIP712Domain): (domainhash: bytes32)</text>
-<text text-anchor="start" x="4973.31" y="-126.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_apporder: AppOrder): (apphash: bytes32)</text>
-<text text-anchor="start" x="4973.31" y="-109.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_datasetorder: DatasetOrder): (datasethash: bytes32)</text>
-<text text-anchor="start" x="4973.31" y="-92.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_workerpoolorder: WorkerpoolOrder): (workerpoolhash: bytes32)</text>
-<text text-anchor="start" x="4973.31" y="-75.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_requestorder: RequestOrder): (requesthash: bytes32)</text>
-<text text-anchor="start" x="4973.31" y="-59.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_apporderoperation: AppOrderOperation): bytes32</text>
-<text text-anchor="start" x="4973.31" y="-42.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_datasetorderoperation: DatasetOrderOperation): bytes32</text>
-<text text-anchor="start" x="4973.31" y="-25.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_workerpoolorderoperation: WorkerpoolOrderOperation): bytes32</text>
-<text text-anchor="start" x="4973.31" y="-8.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_requestorderoperation: RequestOrderOperation): bytes32</text>
+<polygon fill="#f2f2f2" stroke="black" points="4609.02,-0.5 4609.02,-410.9 5042.55,-410.9 5042.55,-0.5 4609.02,-0.5"/>
+<text text-anchor="middle" x="4825.78" y="-394.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Library&gt;&gt;</text>
+<text text-anchor="middle" x="4825.78" y="-377.5" font-family="Times,serif" font-size="14.00">IexecLibOrders_v5</text>
+<text text-anchor="middle" x="4825.78" y="-360.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="4609.02,-352.5 5042.55,-352.5 "/>
+<text text-anchor="start" x="4617.02" y="-335.9" font-family="Times,serif" font-size="14.00">Public:</text>
+<text text-anchor="start" x="4617.02" y="-319.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;EIP712DOMAIN_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="4617.02" y="-302.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;APPORDER_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="4617.02" y="-285.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;DATASETORDER_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="4617.02" y="-268.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;WORKERPOOLORDER_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="4617.02" y="-251.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;REQUESTORDER_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="4617.02" y="-235.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;APPORDEROPERATION_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="4617.02" y="-218.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;DATASETORDEROPERATION_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="4617.02" y="-201.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;WORKERPOOLORDEROPERATION_TYPEHASH: bytes32</text>
+<text text-anchor="start" x="4617.02" y="-184.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;REQUESTORDEROPERATION_TYPEHASH: bytes32</text>
+<polyline fill="none" stroke="black" points="4609.02,-176.5 5042.55,-176.5 "/>
+<text text-anchor="start" x="4617.02" y="-159.9" font-family="Times,serif" font-size="14.00">Public:</text>
+<text text-anchor="start" x="4617.02" y="-143.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_domain: EIP712Domain): (domainhash: bytes32)</text>
+<text text-anchor="start" x="4617.02" y="-126.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_apporder: AppOrder): (apphash: bytes32)</text>
+<text text-anchor="start" x="4617.02" y="-109.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_datasetorder: DatasetOrder): (datasethash: bytes32)</text>
+<text text-anchor="start" x="4617.02" y="-92.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_workerpoolorder: WorkerpoolOrder): (workerpoolhash: bytes32)</text>
+<text text-anchor="start" x="4617.02" y="-75.9" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_requestorder: RequestOrder): (requesthash: bytes32)</text>
+<text text-anchor="start" x="4617.02" y="-59.1" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_apporderoperation: AppOrderOperation): bytes32</text>
+<text text-anchor="start" x="4617.02" y="-42.3" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_datasetorderoperation: DatasetOrderOperation): bytes32</text>
+<text text-anchor="start" x="4617.02" y="-25.5" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_workerpoolorderoperation: WorkerpoolOrderOperation): bytes32</text>
+<text text-anchor="start" x="4617.02" y="-8.7" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;hash(_requestorderoperation: RequestOrderOperation): bytes32</text>
 </g>
 <!-- 18 -->
 <g id="node19" class="node">
 <title>18</title>
-<polygon fill="#f2f2f2" stroke="black" points="4343.47,-548.7 4343.47,-682.3 4566.69,-682.3 4566.69,-548.7 4343.47,-548.7"/>
-<text text-anchor="middle" x="4455.08" y="-665.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="4455.08" y="-648.9" font-family="Times,serif" font-size="14.00">EIP712Domain</text>
-<text text-anchor="middle" x="4455.08" y="-632.1" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="4343.47,-623.9 4566.69,-623.9 "/>
-<text text-anchor="start" x="4351.47" y="-607.3" font-family="Times,serif" font-size="14.00">name: string</text>
-<text text-anchor="start" x="4351.47" y="-590.5" font-family="Times,serif" font-size="14.00">version: string</text>
-<text text-anchor="start" x="4351.47" y="-573.7" font-family="Times,serif" font-size="14.00">chainId: uint256</text>
-<text text-anchor="start" x="4351.47" y="-556.9" font-family="Times,serif" font-size="14.00">verifyingContract: address</text>
+<polygon fill="#f2f2f2" stroke="black" points="3987.17,-502.3 3987.17,-635.9 4210.39,-635.9 4210.39,-502.3 3987.17,-502.3"/>
+<text text-anchor="middle" x="4098.78" y="-619.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="4098.78" y="-602.5" font-family="Times,serif" font-size="14.00">EIP712Domain</text>
+<text text-anchor="middle" x="4098.78" y="-585.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="3987.17,-577.5 4210.39,-577.5 "/>
+<text text-anchor="start" x="3995.17" y="-560.9" font-family="Times,serif" font-size="14.00">name: string</text>
+<text text-anchor="start" x="3995.17" y="-544.1" font-family="Times,serif" font-size="14.00">version: string</text>
+<text text-anchor="start" x="3995.17" y="-527.3" font-family="Times,serif" font-size="14.00">chainId: uint256</text>
+<text text-anchor="start" x="3995.17" y="-510.5" font-family="Times,serif" font-size="14.00">verifyingContract: address</text>
 </g>
 <!-- 16&#45;&gt;18 -->
-<g id="edge31" class="edge">
+<g id="edge32" class="edge">
 <title>16&#45;&gt;18</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4965.15,-259.73C4841.32,-297.96 4688.15,-358.64 4572.08,-447.4 4539.36,-472.42 4510.91,-508.05 4490.14,-539.99"/>
-<polygon fill="black" stroke="black" points="4487.17,-538.13 4484.76,-548.45 4493.08,-541.89 4487.17,-538.13"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4608.82,-268.36C4487.55,-309.06 4336.95,-369.32 4215.78,-447.4 4195.06,-460.75 4174.78,-477.81 4157.05,-494.87"/>
+<polygon fill="black" stroke="black" points="4154.29,-492.67 4149.61,-502.17 4159.2,-497.67 4154.29,-492.67"/>
 </g>
 <!-- 19 -->
 <g id="node20" class="node">
 <title>19</title>
-<polygon fill="#f2f2f2" stroke="black" points="4492.47,-954.5 4492.47,-1172.1 4715.69,-1172.1 4715.69,-954.5 4492.47,-954.5"/>
-<text text-anchor="middle" x="4604.08" y="-1155.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="4604.08" y="-1138.7" font-family="Times,serif" font-size="14.00">AppOrder</text>
-<text text-anchor="middle" x="4604.08" y="-1121.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="4492.47,-1113.7 4715.69,-1113.7 "/>
-<text text-anchor="start" x="4500.47" y="-1097.1" font-family="Times,serif" font-size="14.00">app: address</text>
-<text text-anchor="start" x="4500.47" y="-1080.3" font-family="Times,serif" font-size="14.00">appprice: uint256</text>
-<text text-anchor="start" x="4500.47" y="-1063.5" font-family="Times,serif" font-size="14.00">volume: uint256</text>
-<text text-anchor="start" x="4500.47" y="-1046.7" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
-<text text-anchor="start" x="4500.47" y="-1029.9" font-family="Times,serif" font-size="14.00">datasetrestrict: address</text>
-<text text-anchor="start" x="4500.47" y="-1013.1" font-family="Times,serif" font-size="14.00">workerpoolrestrict: address</text>
-<text text-anchor="start" x="4500.47" y="-996.3" font-family="Times,serif" font-size="14.00">requesterrestrict: address</text>
-<text text-anchor="start" x="4500.47" y="-979.5" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
-<text text-anchor="start" x="4500.47" y="-962.7" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+<polygon fill="#f2f2f2" stroke="black" points="4136.17,-786.1 4136.17,-1003.7 4359.39,-1003.7 4359.39,-786.1 4136.17,-786.1"/>
+<text text-anchor="middle" x="4247.78" y="-987.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="4247.78" y="-970.3" font-family="Times,serif" font-size="14.00">AppOrder</text>
+<text text-anchor="middle" x="4247.78" y="-953.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="4136.17,-945.3 4359.39,-945.3 "/>
+<text text-anchor="start" x="4144.17" y="-928.7" font-family="Times,serif" font-size="14.00">app: address</text>
+<text text-anchor="start" x="4144.17" y="-911.9" font-family="Times,serif" font-size="14.00">appprice: uint256</text>
+<text text-anchor="start" x="4144.17" y="-895.1" font-family="Times,serif" font-size="14.00">volume: uint256</text>
+<text text-anchor="start" x="4144.17" y="-878.3" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
+<text text-anchor="start" x="4144.17" y="-861.5" font-family="Times,serif" font-size="14.00">datasetrestrict: address</text>
+<text text-anchor="start" x="4144.17" y="-844.7" font-family="Times,serif" font-size="14.00">workerpoolrestrict: address</text>
+<text text-anchor="start" x="4144.17" y="-827.9" font-family="Times,serif" font-size="14.00">requesterrestrict: address</text>
+<text text-anchor="start" x="4144.17" y="-811.1" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
+<text text-anchor="start" x="4144.17" y="-794.3" font-family="Times,serif" font-size="14.00">sign: bytes</text>
 </g>
 <!-- 16&#45;&gt;19 -->
-<g id="edge32" class="edge">
+<g id="edge33" class="edge">
 <title>16&#45;&gt;19</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4965.29,-242.04C4843.41,-274.12 4700.61,-334.53 4623.08,-447.4 4569.61,-525.24 4576.62,-788.7 4589.05,-944.37"/>
-<polygon fill="black" stroke="black" points="4585.58,-944.78 4589.88,-954.46 4592.55,-944.21 4585.58,-944.78"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4608.99,-242.7C4487.51,-275 4345.13,-335.41 4266.78,-447.4 4230.99,-498.56 4229.11,-661.56 4234.9,-775.75"/>
+<polygon fill="black" stroke="black" points="4231.41,-776.16 4235.44,-785.95 4238.4,-775.78 4231.41,-776.16"/>
 </g>
 <!-- 20 -->
 <g id="node21" class="node">
 <title>20</title>
-<polygon fill="#f2f2f2" stroke="black" points="5070.47,-954.5 5070.47,-1172.1 5293.69,-1172.1 5293.69,-954.5 5070.47,-954.5"/>
-<text text-anchor="middle" x="5182.08" y="-1155.5" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="5182.08" y="-1138.7" font-family="Times,serif" font-size="14.00">DatasetOrder</text>
-<text text-anchor="middle" x="5182.08" y="-1121.9" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="5070.47,-1113.7 5293.69,-1113.7 "/>
-<text text-anchor="start" x="5078.47" y="-1097.1" font-family="Times,serif" font-size="14.00">dataset: address</text>
-<text text-anchor="start" x="5078.47" y="-1080.3" font-family="Times,serif" font-size="14.00">datasetprice: uint256</text>
-<text text-anchor="start" x="5078.47" y="-1063.5" font-family="Times,serif" font-size="14.00">volume: uint256</text>
-<text text-anchor="start" x="5078.47" y="-1046.7" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
-<text text-anchor="start" x="5078.47" y="-1029.9" font-family="Times,serif" font-size="14.00">apprestrict: address</text>
-<text text-anchor="start" x="5078.47" y="-1013.1" font-family="Times,serif" font-size="14.00">workerpoolrestrict: address</text>
-<text text-anchor="start" x="5078.47" y="-996.3" font-family="Times,serif" font-size="14.00">requesterrestrict: address</text>
-<text text-anchor="start" x="5078.47" y="-979.5" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
-<text text-anchor="start" x="5078.47" y="-962.7" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+<polygon fill="#f2f2f2" stroke="black" points="4714.17,-786.1 4714.17,-1003.7 4937.39,-1003.7 4937.39,-786.1 4714.17,-786.1"/>
+<text text-anchor="middle" x="4825.78" y="-987.1" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="4825.78" y="-970.3" font-family="Times,serif" font-size="14.00">DatasetOrder</text>
+<text text-anchor="middle" x="4825.78" y="-953.5" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="4714.17,-945.3 4937.39,-945.3 "/>
+<text text-anchor="start" x="4722.17" y="-928.7" font-family="Times,serif" font-size="14.00">dataset: address</text>
+<text text-anchor="start" x="4722.17" y="-911.9" font-family="Times,serif" font-size="14.00">datasetprice: uint256</text>
+<text text-anchor="start" x="4722.17" y="-895.1" font-family="Times,serif" font-size="14.00">volume: uint256</text>
+<text text-anchor="start" x="4722.17" y="-878.3" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
+<text text-anchor="start" x="4722.17" y="-861.5" font-family="Times,serif" font-size="14.00">apprestrict: address</text>
+<text text-anchor="start" x="4722.17" y="-844.7" font-family="Times,serif" font-size="14.00">workerpoolrestrict: address</text>
+<text text-anchor="start" x="4722.17" y="-827.9" font-family="Times,serif" font-size="14.00">requesterrestrict: address</text>
+<text text-anchor="start" x="4722.17" y="-811.1" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
+<text text-anchor="start" x="4722.17" y="-794.3" font-family="Times,serif" font-size="14.00">sign: bytes</text>
 </g>
 <!-- 16&#45;&gt;20 -->
-<g id="edge33" class="edge">
+<g id="edge34" class="edge">
 <title>16&#45;&gt;20</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5176.22,-411.09C5174.75,-577.59 5175.09,-806.85 5177.25,-944.24"/>
-<polygon fill="black" stroke="black" points="5173.75,-944.44 5177.41,-954.38 5180.75,-944.32 5173.75,-944.44"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4819.55,-411.02C4818.62,-529.98 4818.95,-675.75 4820.54,-775.82"/>
+<polygon fill="black" stroke="black" points="4817.04,-776.02 4820.71,-785.96 4824.04,-775.9 4817.04,-776.02"/>
 </g>
 <!-- 21 -->
 <g id="node22" class="node">
 <title>21</title>
-<polygon fill="#f2f2f2" stroke="black" points="5368.47,-937.7 5368.47,-1188.9 5591.69,-1188.9 5591.69,-937.7 5368.47,-937.7"/>
-<text text-anchor="middle" x="5480.08" y="-1172.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="5480.08" y="-1155.5" font-family="Times,serif" font-size="14.00">WorkerpoolOrder</text>
-<text text-anchor="middle" x="5480.08" y="-1138.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="5368.47,-1130.5 5591.69,-1130.5 "/>
-<text text-anchor="start" x="5376.47" y="-1113.9" font-family="Times,serif" font-size="14.00">workerpool: address</text>
-<text text-anchor="start" x="5376.47" y="-1097.1" font-family="Times,serif" font-size="14.00">workerpoolprice: uint256</text>
-<text text-anchor="start" x="5376.47" y="-1080.3" font-family="Times,serif" font-size="14.00">volume: uint256</text>
-<text text-anchor="start" x="5376.47" y="-1063.5" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
-<text text-anchor="start" x="5376.47" y="-1046.7" font-family="Times,serif" font-size="14.00">category: uint256</text>
-<text text-anchor="start" x="5376.47" y="-1029.9" font-family="Times,serif" font-size="14.00">trust: uint256</text>
-<text text-anchor="start" x="5376.47" y="-1013.1" font-family="Times,serif" font-size="14.00">apprestrict: address</text>
-<text text-anchor="start" x="5376.47" y="-996.3" font-family="Times,serif" font-size="14.00">datasetrestrict: address</text>
-<text text-anchor="start" x="5376.47" y="-979.5" font-family="Times,serif" font-size="14.00">requesterrestrict: address</text>
-<text text-anchor="start" x="5376.47" y="-962.7" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
-<text text-anchor="start" x="5376.47" y="-945.9" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+<polygon fill="#f2f2f2" stroke="black" points="5012.17,-769.3 5012.17,-1020.5 5235.39,-1020.5 5235.39,-769.3 5012.17,-769.3"/>
+<text text-anchor="middle" x="5123.78" y="-1003.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="5123.78" y="-987.1" font-family="Times,serif" font-size="14.00">WorkerpoolOrder</text>
+<text text-anchor="middle" x="5123.78" y="-970.3" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="5012.17,-962.1 5235.39,-962.1 "/>
+<text text-anchor="start" x="5020.17" y="-945.5" font-family="Times,serif" font-size="14.00">workerpool: address</text>
+<text text-anchor="start" x="5020.17" y="-928.7" font-family="Times,serif" font-size="14.00">workerpoolprice: uint256</text>
+<text text-anchor="start" x="5020.17" y="-911.9" font-family="Times,serif" font-size="14.00">volume: uint256</text>
+<text text-anchor="start" x="5020.17" y="-895.1" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
+<text text-anchor="start" x="5020.17" y="-878.3" font-family="Times,serif" font-size="14.00">category: uint256</text>
+<text text-anchor="start" x="5020.17" y="-861.5" font-family="Times,serif" font-size="14.00">trust: uint256</text>
+<text text-anchor="start" x="5020.17" y="-844.7" font-family="Times,serif" font-size="14.00">apprestrict: address</text>
+<text text-anchor="start" x="5020.17" y="-827.9" font-family="Times,serif" font-size="14.00">datasetrestrict: address</text>
+<text text-anchor="start" x="5020.17" y="-811.1" font-family="Times,serif" font-size="14.00">requesterrestrict: address</text>
+<text text-anchor="start" x="5020.17" y="-794.3" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
+<text text-anchor="start" x="5020.17" y="-777.5" font-family="Times,serif" font-size="14.00">sign: bytes</text>
 </g>
 <!-- 16&#45;&gt;21 -->
-<g id="edge34" class="edge">
+<g id="edge35" class="edge">
 <title>16&#45;&gt;21</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5399.04,-379.04C5416.33,-400.3 5431.54,-423.16 5443.08,-447.4 5482.02,-529.25 5481.65,-772.66 5479.58,-927.56"/>
-<polygon fill="black" stroke="black" points="5476.08,-927.58 5479.44,-937.63 5483.08,-927.68 5476.08,-927.58"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5042.61,-379.62C5059.87,-400.73 5075.11,-423.4 5086.78,-447.4 5133.77,-544.01 5138.16,-666.56 5133.68,-758.83"/>
+<polygon fill="black" stroke="black" points="5130.17,-758.9 5133.14,-769.07 5137.16,-759.27 5130.17,-758.9"/>
 </g>
 <!-- 22 -->
 <g id="node23" class="node">
 <title>22</title>
-<polygon fill="#f2f2f2" stroke="black" points="5666.47,-895.7 5666.47,-1230.9 5889.69,-1230.9 5889.69,-895.7 5666.47,-895.7"/>
-<text text-anchor="middle" x="5778.08" y="-1214.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="5778.08" y="-1197.5" font-family="Times,serif" font-size="14.00">RequestOrder</text>
-<text text-anchor="middle" x="5778.08" y="-1180.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="5666.47,-1172.5 5889.69,-1172.5 "/>
-<text text-anchor="start" x="5674.47" y="-1155.9" font-family="Times,serif" font-size="14.00">app: address</text>
-<text text-anchor="start" x="5674.47" y="-1139.1" font-family="Times,serif" font-size="14.00">appmaxprice: uint256</text>
-<text text-anchor="start" x="5674.47" y="-1122.3" font-family="Times,serif" font-size="14.00">dataset: address</text>
-<text text-anchor="start" x="5674.47" y="-1105.5" font-family="Times,serif" font-size="14.00">datasetmaxprice: uint256</text>
-<text text-anchor="start" x="5674.47" y="-1088.7" font-family="Times,serif" font-size="14.00">workerpool: address</text>
-<text text-anchor="start" x="5674.47" y="-1071.9" font-family="Times,serif" font-size="14.00">workerpoolmaxprice: uint256</text>
-<text text-anchor="start" x="5674.47" y="-1055.1" font-family="Times,serif" font-size="14.00">requester: address</text>
-<text text-anchor="start" x="5674.47" y="-1038.3" font-family="Times,serif" font-size="14.00">volume: uint256</text>
-<text text-anchor="start" x="5674.47" y="-1021.5" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
-<text text-anchor="start" x="5674.47" y="-1004.7" font-family="Times,serif" font-size="14.00">category: uint256</text>
-<text text-anchor="start" x="5674.47" y="-987.9" font-family="Times,serif" font-size="14.00">trust: uint256</text>
-<text text-anchor="start" x="5674.47" y="-971.1" font-family="Times,serif" font-size="14.00">beneficiary: address</text>
-<text text-anchor="start" x="5674.47" y="-954.3" font-family="Times,serif" font-size="14.00">callback: address</text>
-<text text-anchor="start" x="5674.47" y="-937.5" font-family="Times,serif" font-size="14.00">params: string</text>
-<text text-anchor="start" x="5674.47" y="-920.7" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
-<text text-anchor="start" x="5674.47" y="-903.9" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+<polygon fill="#f2f2f2" stroke="black" points="5310.17,-727.3 5310.17,-1062.5 5533.39,-1062.5 5533.39,-727.3 5310.17,-727.3"/>
+<text text-anchor="middle" x="5421.78" y="-1045.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="5421.78" y="-1029.1" font-family="Times,serif" font-size="14.00">RequestOrder</text>
+<text text-anchor="middle" x="5421.78" y="-1012.3" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="5310.17,-1004.1 5533.39,-1004.1 "/>
+<text text-anchor="start" x="5318.17" y="-987.5" font-family="Times,serif" font-size="14.00">app: address</text>
+<text text-anchor="start" x="5318.17" y="-970.7" font-family="Times,serif" font-size="14.00">appmaxprice: uint256</text>
+<text text-anchor="start" x="5318.17" y="-953.9" font-family="Times,serif" font-size="14.00">dataset: address</text>
+<text text-anchor="start" x="5318.17" y="-937.1" font-family="Times,serif" font-size="14.00">datasetmaxprice: uint256</text>
+<text text-anchor="start" x="5318.17" y="-920.3" font-family="Times,serif" font-size="14.00">workerpool: address</text>
+<text text-anchor="start" x="5318.17" y="-903.5" font-family="Times,serif" font-size="14.00">workerpoolmaxprice: uint256</text>
+<text text-anchor="start" x="5318.17" y="-886.7" font-family="Times,serif" font-size="14.00">requester: address</text>
+<text text-anchor="start" x="5318.17" y="-869.9" font-family="Times,serif" font-size="14.00">volume: uint256</text>
+<text text-anchor="start" x="5318.17" y="-853.1" font-family="Times,serif" font-size="14.00">tag: bytes32</text>
+<text text-anchor="start" x="5318.17" y="-836.3" font-family="Times,serif" font-size="14.00">category: uint256</text>
+<text text-anchor="start" x="5318.17" y="-819.5" font-family="Times,serif" font-size="14.00">trust: uint256</text>
+<text text-anchor="start" x="5318.17" y="-802.7" font-family="Times,serif" font-size="14.00">beneficiary: address</text>
+<text text-anchor="start" x="5318.17" y="-785.9" font-family="Times,serif" font-size="14.00">callback: address</text>
+<text text-anchor="start" x="5318.17" y="-769.1" font-family="Times,serif" font-size="14.00">params: string</text>
+<text text-anchor="start" x="5318.17" y="-752.3" font-family="Times,serif" font-size="14.00">salt: bytes32</text>
+<text text-anchor="start" x="5318.17" y="-735.5" font-family="Times,serif" font-size="14.00">sign: bytes</text>
 </g>
 <!-- 16&#45;&gt;22 -->
-<g id="edge35" class="edge">
+<g id="edge36" class="edge">
 <title>16&#45;&gt;22</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5399.14,-242.55C5520.52,-274.57 5662.72,-334.75 5741.08,-447.4 5829.1,-573.94 5826.82,-753.1 5809.66,-885.4"/>
-<polygon fill="black" stroke="black" points="5806.15,-885.27 5808.29,-895.65 5813.09,-886.2 5806.15,-885.27"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5042.83,-243.24C5163.82,-275.48 5305.62,-335.64 5384.78,-447.4 5439.25,-524.3 5448.38,-628.59 5443.87,-717.04"/>
+<polygon fill="black" stroke="black" points="5440.37,-717.02 5443.29,-727.2 5447.35,-717.41 5440.37,-717.02"/>
 </g>
 <!-- 23 -->
 <g id="node24" class="node">
 <title>23</title>
-<polygon fill="#f2f2f2" stroke="black" points="4641.47,-557.1 4641.47,-673.9 4864.69,-673.9 4864.69,-557.1 4641.47,-557.1"/>
-<text text-anchor="middle" x="4753.08" y="-657.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="4753.08" y="-640.5" font-family="Times,serif" font-size="14.00">AppOrderOperation</text>
-<text text-anchor="middle" x="4753.08" y="-623.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="4641.47,-615.5 4864.69,-615.5 "/>
-<text text-anchor="start" x="4649.47" y="-598.9" font-family="Times,serif" font-size="14.00">order: AppOrder</text>
-<text text-anchor="start" x="4649.47" y="-582.1" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
-<text text-anchor="start" x="4649.47" y="-565.3" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+<polygon fill="#f2f2f2" stroke="black" points="4285.17,-510.7 4285.17,-627.5 4508.39,-627.5 4508.39,-510.7 4285.17,-510.7"/>
+<text text-anchor="middle" x="4396.78" y="-610.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="4396.78" y="-594.1" font-family="Times,serif" font-size="14.00">AppOrderOperation</text>
+<text text-anchor="middle" x="4396.78" y="-577.3" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="4285.17,-569.1 4508.39,-569.1 "/>
+<text text-anchor="start" x="4293.17" y="-552.5" font-family="Times,serif" font-size="14.00">order: AppOrder</text>
+<text text-anchor="start" x="4293.17" y="-535.7" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
+<text text-anchor="start" x="4293.17" y="-518.9" font-family="Times,serif" font-size="14.00">sign: bytes</text>
 </g>
 <!-- 16&#45;&gt;23 -->
-<g id="edge36" class="edge">
+<g id="edge37" class="edge">
 <title>16&#45;&gt;23</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4965.01,-360.5C4931.92,-388.08 4899.16,-417.58 4870.08,-447.4 4839.92,-478.32 4810.61,-516.56 4788.75,-548.65"/>
-<polygon fill="black" stroke="black" points="4785.75,-546.84 4783.07,-557.1 4791.56,-550.75 4785.75,-546.84"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4608.62,-367.97C4576.38,-394.04 4543.9,-421.11 4513.78,-447.4 4493.64,-464.99 4472.4,-484.8 4453.59,-503.21"/>
+<polygon fill="black" stroke="black" points="4450.9,-500.94 4446.24,-510.45 4455.82,-505.93 4450.9,-500.94"/>
 </g>
 <!-- 24 -->
 <g id="node25" class="node">
 <title>24</title>
-<polygon fill="#f2f2f2" stroke="black" points="4921.47,-557.1 4921.47,-673.9 5144.69,-673.9 5144.69,-557.1 4921.47,-557.1"/>
-<text text-anchor="middle" x="5033.08" y="-657.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="5033.08" y="-640.5" font-family="Times,serif" font-size="14.00">DatasetOrderOperation</text>
-<text text-anchor="middle" x="5033.08" y="-623.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="4921.47,-615.5 5144.69,-615.5 "/>
-<text text-anchor="start" x="4929.47" y="-598.9" font-family="Times,serif" font-size="14.00">order: DatasetOrder</text>
-<text text-anchor="start" x="4929.47" y="-582.1" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
-<text text-anchor="start" x="4929.47" y="-565.3" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+<polygon fill="#f2f2f2" stroke="black" points="4565.17,-510.7 4565.17,-627.5 4788.39,-627.5 4788.39,-510.7 4565.17,-510.7"/>
+<text text-anchor="middle" x="4676.78" y="-610.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="4676.78" y="-594.1" font-family="Times,serif" font-size="14.00">DatasetOrderOperation</text>
+<text text-anchor="middle" x="4676.78" y="-577.3" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="4565.17,-569.1 4788.39,-569.1 "/>
+<text text-anchor="start" x="4573.17" y="-552.5" font-family="Times,serif" font-size="14.00">order: DatasetOrder</text>
+<text text-anchor="start" x="4573.17" y="-535.7" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
+<text text-anchor="start" x="4573.17" y="-518.9" font-family="Times,serif" font-size="14.00">sign: bytes</text>
 </g>
 <!-- 16&#45;&gt;24 -->
-<g id="edge37" class="edge">
+<g id="edge38" class="edge">
 <title>16&#45;&gt;24</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5100.61,-411.2C5082.68,-460.27 5065.3,-509.3 5052.6,-546.91"/>
-<polygon fill="black" stroke="black" points="5049.18,-546.12 5049.31,-556.71 5055.81,-548.34 5049.18,-546.12"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4734.79,-411.16C4721.56,-443.59 4709.06,-474.99 4699.04,-501.06"/>
+<polygon fill="black" stroke="black" points="4695.76,-499.83 4695.46,-510.42 4702.3,-502.33 4695.76,-499.83"/>
 </g>
 <!-- 25 -->
 <g id="node26" class="node">
 <title>25</title>
-<polygon fill="#f2f2f2" stroke="black" points="5219.47,-557.1 5219.47,-673.9 5442.69,-673.9 5442.69,-557.1 5219.47,-557.1"/>
-<text text-anchor="middle" x="5331.08" y="-657.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="5331.08" y="-640.5" font-family="Times,serif" font-size="14.00">WorkerpoolOrderOperation</text>
-<text text-anchor="middle" x="5331.08" y="-623.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="5219.47,-615.5 5442.69,-615.5 "/>
-<text text-anchor="start" x="5227.47" y="-598.9" font-family="Times,serif" font-size="14.00">order: WorkerpoolOrder</text>
-<text text-anchor="start" x="5227.47" y="-582.1" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
-<text text-anchor="start" x="5227.47" y="-565.3" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+<polygon fill="#f2f2f2" stroke="black" points="4863.17,-510.7 4863.17,-627.5 5086.39,-627.5 5086.39,-510.7 4863.17,-510.7"/>
+<text text-anchor="middle" x="4974.78" y="-610.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="4974.78" y="-594.1" font-family="Times,serif" font-size="14.00">WorkerpoolOrderOperation</text>
+<text text-anchor="middle" x="4974.78" y="-577.3" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="4863.17,-569.1 5086.39,-569.1 "/>
+<text text-anchor="start" x="4871.17" y="-552.5" font-family="Times,serif" font-size="14.00">order: WorkerpoolOrder</text>
+<text text-anchor="start" x="4871.17" y="-535.7" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
+<text text-anchor="start" x="4871.17" y="-518.9" font-family="Times,serif" font-size="14.00">sign: bytes</text>
 </g>
 <!-- 16&#45;&gt;25 -->
-<g id="edge38" class="edge">
+<g id="edge39" class="edge">
 <title>16&#45;&gt;25</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5250.05,-411.2C5268.06,-460.48 5286.58,-509.72 5301.4,-547.39"/>
-<polygon fill="black" stroke="black" points="5298.15,-548.7 5305.08,-556.71 5304.66,-546.12 5298.15,-548.7"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4903.38,-411.16C4916.9,-443.59 4930.28,-474.99 4941.76,-501.06"/>
+<polygon fill="black" stroke="black" points="4938.65,-502.69 4945.9,-510.42 4945.05,-499.86 4938.65,-502.69"/>
 </g>
 <!-- 26 -->
 <g id="node27" class="node">
 <title>26</title>
-<polygon fill="#f2f2f2" stroke="black" points="5517.47,-557.1 5517.47,-673.9 5740.69,-673.9 5740.69,-557.1 5517.47,-557.1"/>
-<text text-anchor="middle" x="5629.08" y="-657.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
-<text text-anchor="middle" x="5629.08" y="-640.5" font-family="Times,serif" font-size="14.00">RequestOrderOperation</text>
-<text text-anchor="middle" x="5629.08" y="-623.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="5517.47,-615.5 5740.69,-615.5 "/>
-<text text-anchor="start" x="5525.47" y="-598.9" font-family="Times,serif" font-size="14.00">order: RequestOrder</text>
-<text text-anchor="start" x="5525.47" y="-582.1" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
-<text text-anchor="start" x="5525.47" y="-565.3" font-family="Times,serif" font-size="14.00">sign: bytes</text>
+<polygon fill="#f2f2f2" stroke="black" points="5161.17,-510.7 5161.17,-627.5 5384.39,-627.5 5384.39,-510.7 5161.17,-510.7"/>
+<text text-anchor="middle" x="5272.78" y="-610.9" font-family="Times,serif" font-size="14.00">&lt;&lt;Struct&gt;&gt;</text>
+<text text-anchor="middle" x="5272.78" y="-594.1" font-family="Times,serif" font-size="14.00">RequestOrderOperation</text>
+<text text-anchor="middle" x="5272.78" y="-577.3" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="5161.17,-569.1 5384.39,-569.1 "/>
+<text text-anchor="start" x="5169.17" y="-552.5" font-family="Times,serif" font-size="14.00">order: RequestOrder</text>
+<text text-anchor="start" x="5169.17" y="-535.7" font-family="Times,serif" font-size="14.00">operation: OrderOperationEnum</text>
+<text text-anchor="start" x="5169.17" y="-518.9" font-family="Times,serif" font-size="14.00">sign: bytes</text>
 </g>
 <!-- 16&#45;&gt;26 -->
-<g id="edge39" class="edge">
+<g id="edge40" class="edge">
 <title>16&#45;&gt;26</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5399.2,-363.38C5432.24,-389.95 5464.98,-418.38 5494.08,-447.4 5524.66,-477.9 5554.01,-516.11 5577.58,-548.29"/>
-<polygon fill="black" stroke="black" points="5575.04,-550.74 5583.75,-556.76 5580.69,-546.61 5575.04,-550.74"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5042.78,-370.68C5075.09,-395.76 5107.64,-421.82 5137.78,-447.4 5158.37,-464.87 5179.89,-484.8 5199.58,-503.36"/>
+<polygon fill="black" stroke="black" points="5197.36,-506.08 5207.03,-510.4 5202.17,-500.99 5197.36,-506.08"/>
 </g>
 <!-- 17 -->
 <g id="node18" class="node">
 <title>17</title>
-<polygon fill="#f2f2f2" stroke="black" points="4805.47,-1013.3 4805.47,-1113.3 5028.69,-1113.3 5028.69,-1013.3 4805.47,-1013.3"/>
-<text text-anchor="middle" x="4917.08" y="-1096.7" font-family="Times,serif" font-size="14.00">&lt;&lt;Enum&gt;&gt;</text>
-<text text-anchor="middle" x="4917.08" y="-1079.9" font-family="Times,serif" font-size="14.00">OrderOperationEnum</text>
-<text text-anchor="middle" x="4917.08" y="-1063.1" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
-<polyline fill="none" stroke="black" points="4805.47,-1054.9 5028.69,-1054.9 "/>
-<text text-anchor="start" x="4813.47" y="-1038.3" font-family="Times,serif" font-size="14.00">SIGN: 0</text>
-<text text-anchor="start" x="4813.47" y="-1021.5" font-family="Times,serif" font-size="14.00">CLOSE: 1</text>
+<polygon fill="#f2f2f2" stroke="black" points="4449.17,-844.9 4449.17,-944.9 4672.39,-944.9 4672.39,-844.9 4449.17,-844.9"/>
+<text text-anchor="middle" x="4560.78" y="-928.3" font-family="Times,serif" font-size="14.00">&lt;&lt;Enum&gt;&gt;</text>
+<text text-anchor="middle" x="4560.78" y="-911.5" font-family="Times,serif" font-size="14.00">OrderOperationEnum</text>
+<text text-anchor="middle" x="4560.78" y="-894.7" font-family="Times,serif" font-size="14.00">contracts/libs/IexecLibOrders_v5.sol</text>
+<polyline fill="none" stroke="black" points="4449.17,-886.5 4672.39,-886.5 "/>
+<text text-anchor="start" x="4457.17" y="-869.9" font-family="Times,serif" font-size="14.00">SIGN: 0</text>
+<text text-anchor="start" x="4457.17" y="-853.1" font-family="Times,serif" font-size="14.00">CLOSE: 1</text>
 </g>
 <!-- 17&#45;&gt;16 -->
-<g id="edge21" class="edge">
+<g id="edge22" class="edge">
 <title>17&#45;&gt;16</title>
-<path fill="none" stroke="black" d="M4911.48,-1013.04C4897.82,-885.58 4867.05,-547.86 4912.08,-447.4 4923.54,-421.83 4939.21,-397.86 4957.27,-375.71"/>
-<polygon fill="black" stroke="black" points="4957.44,-375.51 4958.23,-368.35 4965.15,-366.32 4964.36,-373.49 4957.44,-375.51"/>
+<path fill="none" stroke="black" d="M4547.38,-844.62C4526.89,-759.33 4496.1,-580.57 4555.78,-447.4 4567.24,-421.83 4582.91,-397.86 4600.98,-375.71"/>
+<polygon fill="black" stroke="black" points="4601.14,-375.51 4601.94,-368.35 4608.86,-366.32 4608.06,-373.49 4601.14,-375.51"/>
 </g>
 <!-- 18&#45;&gt;16 -->
-<g id="edge22" class="edge">
+<g id="edge23" class="edge">
 <title>18&#45;&gt;16</title>
-<path fill="none" stroke="black" d="M4500.74,-548.45C4523.86,-514.5 4554.43,-474.66 4590.08,-447.4 4697.66,-365.14 4837.1,-306.99 4953.65,-268.48"/>
-<polygon fill="black" stroke="black" points="4953.81,-268.43 4958.27,-262.76 4965.21,-264.7 4960.75,-270.37 4953.81,-268.43"/>
+<path fill="none" stroke="black" d="M4166.75,-502.17C4187,-482.76 4210.1,-462.66 4233.78,-447.4 4345.91,-375.15 4483.23,-318.16 4597.39,-277.81"/>
+<polygon fill="black" stroke="black" points="4597.4,-277.81 4601.73,-272.04 4608.72,-273.83 4604.38,-279.59 4597.4,-277.81"/>
 </g>
 <!-- 19&#45;&gt;16 -->
-<g id="edge23" class="edge">
+<g id="edge24" class="edge">
 <title>19&#45;&gt;16</title>
-<path fill="none" stroke="black" d="M4601.56,-954.46C4594.96,-800.36 4586.43,-526.95 4641.08,-447.4 4712.75,-343.05 4840.22,-283.54 4953.44,-249.81"/>
-<polygon fill="black" stroke="black" points="4953.53,-249.78 4958.17,-244.26 4965.05,-246.42 4960.41,-251.94 4953.53,-249.78"/>
+<path fill="none" stroke="black" d="M4248.57,-785.95C4247.03,-671.5 4247.91,-500.1 4284.78,-447.4 4357.21,-343.88 4484.35,-284.43 4597.2,-250.52"/>
+<polygon fill="black" stroke="black" points="4597.27,-250.5 4601.89,-244.97 4608.78,-247.12 4604.15,-252.65 4597.27,-250.5"/>
 </g>
 <!-- 20&#45;&gt;16 -->
-<g id="edge24" class="edge">
+<g id="edge25" class="edge">
 <title>20&#45;&gt;16</title>
-<path fill="none" stroke="black" d="M5186.74,-954.38C5188.99,-821.55 5189.42,-592.8 5188.04,-423.2"/>
-<polygon fill="black" stroke="black" points="5188.03,-423.09 5183.98,-417.13 5187.93,-411.09 5191.98,-417.06 5188.03,-423.09"/>
+<path fill="none" stroke="black" d="M4830.86,-785.96C4832.54,-689.12 4832.96,-544.09 4832.11,-423.37"/>
+<polygon fill="black" stroke="black" points="4832.1,-423.02 4828.06,-417.05 4832.01,-411.02 4836.06,-416.99 4832.1,-423.02"/>
 </g>
 <!-- 21&#45;&gt;16 -->
-<g id="edge25" class="edge">
+<g id="edge26" class="edge">
 <title>21&#45;&gt;16</title>
-<path fill="none" stroke="black" d="M5491.85,-937.63C5499.61,-783.43 5500.88,-531.05 5461.08,-447.4 5447.38,-418.61 5428.5,-391.78 5406.96,-367.25"/>
-<polygon fill="black" stroke="black" points="5406.94,-367.23 5399.95,-365.46 5398.9,-358.32 5405.89,-360.1 5406.94,-367.23"/>
+<path fill="none" stroke="black" d="M5147.97,-769.07C5156.43,-675.79 5153.53,-547.63 5104.78,-447.4 5091.02,-419.11 5072.31,-392.67 5051.04,-368.45"/>
+<polygon fill="black" stroke="black" points="5050.8,-368.18 5043.81,-366.4 5042.76,-359.27 5049.75,-361.05 5050.8,-368.18"/>
 </g>
 <!-- 22&#45;&gt;16 -->
-<g id="edge26" class="edge">
+<g id="edge27" class="edge">
 <title>22&#45;&gt;16</title>
-<path fill="none" stroke="black" d="M5822.81,-895.65C5844.64,-762.47 5849.39,-577.24 5759.08,-447.4 5679.91,-333.58 5535.58,-273.33 5411.05,-241.57"/>
-<polygon fill="black" stroke="black" points="5410.71,-241.48 5403.92,-243.91 5399.07,-238.58 5405.86,-236.15 5410.71,-241.48"/>
+<path fill="none" stroke="black" d="M5459.14,-727.2C5467.02,-636.67 5459.35,-527.26 5402.78,-447.4 5322.8,-334.48 5178.86,-274.23 5054.75,-242.25"/>
+<polygon fill="black" stroke="black" points="5054.44,-242.17 5047.64,-244.58 5042.8,-239.24 5049.59,-236.82 5054.44,-242.17"/>
 </g>
 <!-- 23&#45;&gt;16 -->
-<g id="edge27" class="edge">
+<g id="edge28" class="edge">
 <title>23&#45;&gt;16</title>
-<path fill="none" stroke="black" d="M4798.74,-557.1C4823.37,-523.45 4855.23,-481.09 4888.08,-447.4 4909.29,-425.65 4932.46,-404.07 4956.19,-383.28"/>
-<polygon fill="black" stroke="black" points="4956.25,-383.23 4958.16,-376.27 4965.31,-375.36 4963.4,-382.31 4956.25,-383.23"/>
+<path fill="none" stroke="black" d="M4463.17,-510.45C4484.74,-490.09 4508.96,-467.32 4531.78,-447.4 4553.47,-428.47 4576.38,-409.14 4599.47,-390.06"/>
+<polygon fill="black" stroke="black" points="4599.75,-389.82 4601.84,-382.92 4609.01,-382.19 4606.93,-389.1 4599.75,-389.82"/>
 </g>
 <!-- 23&#45;&gt;17 -->
-<g id="edge41" class="edge">
+<g id="edge42" class="edge">
 <title>23&#45;&gt;17</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4774.35,-674.32C4805.69,-759.51 4863.94,-917.86 4895.47,-1003.56"/>
-<polygon fill="black" stroke="black" points="4892.26,-1004.96 4898.99,-1013.14 4898.82,-1002.55 4892.26,-1004.96"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4425.91,-627.62C4455.62,-686.27 4501.46,-776.78 4531.3,-835.68"/>
+<polygon fill="black" stroke="black" points="4528.3,-837.52 4535.94,-844.86 4534.55,-834.35 4528.3,-837.52"/>
 </g>
 <!-- 23&#45;&gt;19 -->
-<g id="edge40" class="edge">
+<g id="edge41" class="edge">
 <title>23&#45;&gt;19</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4733.75,-674.32C4710.98,-742.45 4672.57,-857.37 4643.45,-944.51"/>
-<polygon fill="black" stroke="black" points="4640.06,-943.59 4640.21,-954.18 4646.7,-945.81 4640.06,-943.59"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4370.32,-627.62C4351.34,-668.85 4325.13,-725.82 4301.81,-776.5"/>
+<polygon fill="black" stroke="black" points="4298.49,-775.33 4297.49,-785.88 4304.85,-778.26 4298.49,-775.33"/>
 </g>
 <!-- 24&#45;&gt;16 -->
-<g id="edge28" class="edge">
+<g id="edge29" class="edge">
 <title>24&#45;&gt;16</title>
-<path fill="none" stroke="black" d="M5059.07,-556.71C5073.36,-520.78 5091.76,-472.09 5109.98,-422.47"/>
-<polygon fill="black" stroke="black" points="5109.98,-422.47 5108.29,-415.46 5114.11,-411.2 5115.8,-418.21 5109.98,-422.47"/>
+<path fill="none" stroke="black" d="M4705.67,-510.42C4716.7,-485.61 4729.88,-454.9 4743.39,-422.63"/>
+<polygon fill="black" stroke="black" points="4743.56,-422.23 4742.18,-415.16 4748.18,-411.16 4749.56,-418.24 4743.56,-422.23"/>
 </g>
 <!-- 24&#45;&gt;17 -->
-<g id="edge43" class="edge">
+<g id="edge44" class="edge">
 <title>24&#45;&gt;17</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5018.03,-674.32C4995.89,-759.42 4954.75,-917.54 4932.43,-1003.3"/>
-<polygon fill="black" stroke="black" points="4929,-1002.58 4929.87,-1013.14 4935.78,-1004.34 4929,-1002.58"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4656.18,-627.62C4635.21,-686.15 4602.87,-776.41 4581.77,-835.32"/>
+<polygon fill="black" stroke="black" points="4578.43,-834.26 4578.35,-844.86 4585.02,-836.62 4578.43,-834.26"/>
 </g>
 <!-- 24&#45;&gt;20 -->
-<g id="edge42" class="edge">
+<g id="edge43" class="edge">
 <title>24&#45;&gt;20</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5052.4,-674.32C5075.17,-742.45 5113.58,-857.37 5142.71,-944.51"/>
-<polygon fill="black" stroke="black" points="5139.45,-945.81 5145.94,-954.18 5146.09,-943.59 5139.45,-945.81"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4703.25,-627.62C4722.22,-668.85 4748.44,-725.82 4771.76,-776.5"/>
+<polygon fill="black" stroke="black" points="4768.72,-778.26 4776.08,-785.88 4775.08,-775.33 4768.72,-778.26"/>
 </g>
 <!-- 25&#45;&gt;16 -->
-<g id="edge29" class="edge">
+<g id="edge30" class="edge">
 <title>25&#45;&gt;16</title>
-<path fill="none" stroke="black" d="M5314.84,-556.71C5302.89,-520.85 5285.77,-472.3 5267.77,-422.78"/>
-<polygon fill="black" stroke="black" points="5267.66,-422.47 5261.84,-418.2 5263.55,-411.2 5269.36,-415.46 5267.66,-422.47"/>
+<path fill="none" stroke="black" d="M4956.1,-510.42C4946.68,-485.61 4934.53,-454.9 4921.44,-422.63"/>
+<polygon fill="black" stroke="black" points="4921.3,-422.28 4915.33,-418.23 4916.78,-411.16 4922.74,-415.21 4921.3,-422.28"/>
 </g>
 <!-- 25&#45;&gt;17 -->
-<g id="edge45" class="edge">
+<g id="edge46" class="edge">
 <title>25&#45;&gt;17</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5281.05,-673.98C5247.87,-709.34 5201.79,-753.49 5154.08,-783.6 5116.6,-807.26 5094.91,-790.97 5061.08,-819.6 5002.51,-869.16 4961.71,-948.9 4938.86,-1003.36"/>
-<polygon fill="black" stroke="black" points="4935.51,-1002.3 4934.94,-1012.88 4941.98,-1004.97 4935.51,-1002.3"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M4898.77,-627.58C4868.34,-649.06 4832.35,-672.63 4797.78,-690.8 4758.55,-711.42 4741,-701.25 4704.78,-726.8 4662.92,-756.33 4625.49,-800.63 4599.29,-836.2"/>
+<polygon fill="black" stroke="black" points="4596.25,-834.42 4593.21,-844.57 4601.91,-838.54 4596.25,-834.42"/>
 </g>
 <!-- 25&#45;&gt;21 -->
-<g id="edge44" class="edge">
+<g id="edge45" class="edge">
 <title>25&#45;&gt;21</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5350.4,-674.32C5371.75,-738.18 5406.84,-843.16 5435.13,-927.83"/>
-<polygon fill="black" stroke="black" points="5431.88,-929.15 5438.37,-937.52 5438.52,-926.93 5431.88,-929.15"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5001.25,-627.62C5018.18,-664.42 5040.89,-713.76 5062.15,-759.97"/>
+<polygon fill="black" stroke="black" points="5059.03,-761.55 5066.39,-769.17 5065.39,-758.62 5059.03,-761.55"/>
 </g>
 <!-- 26&#45;&gt;16 -->
-<g id="edge30" class="edge">
+<g id="edge31" class="edge">
 <title>26&#45;&gt;16</title>
-<path fill="none" stroke="black" d="M5599.42,-556.76C5577.25,-523 5545.39,-480.63 5512.08,-447.4 5480.61,-416.02 5444.89,-385.33 5408.86,-356.94"/>
-<polygon fill="black" stroke="black" points="5408.64,-356.77 5401.45,-356.23 5399.19,-349.38 5406.38,-349.92 5408.64,-356.77"/>
+<path fill="none" stroke="black" d="M5223.94,-510.4C5203.4,-489.93 5179,-467.1 5155.78,-447.4 5123.14,-419.7 5087.66,-391.42 5052.47,-364.44"/>
+<polygon fill="black" stroke="black" points="5052.09,-364.15 5044.89,-363.69 5042.55,-356.87 5049.75,-357.33 5052.09,-364.15"/>
 </g>
 <!-- 26&#45;&gt;17 -->
-<g id="edge47" class="edge">
+<g id="edge48" class="edge">
 <title>26&#45;&gt;17</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5585.5,-674.16C5553.19,-712.24 5505.61,-759.42 5452.08,-783.6 5293.03,-855.43 5208.6,-726.38 5061.08,-819.6 4994.71,-861.54 4955.01,-946.05 4934.6,-1003.42"/>
-<polygon fill="black" stroke="black" points="4931.21,-1002.5 4931.24,-1013.09 4937.83,-1004.79 4931.21,-1002.5"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5205.82,-627.7C5174.46,-651.4 5135.33,-676.58 5095.78,-690.8 4931.56,-749.84 4859.92,-646.89 4704.78,-726.8 4657.46,-751.17 4619.08,-798.34 4593.88,-836.36"/>
+<polygon fill="black" stroke="black" points="4590.9,-834.52 4588.39,-844.82 4596.77,-838.33 4590.9,-834.52"/>
 </g>
 <!-- 26&#45;&gt;22 -->
-<g id="edge46" class="edge">
+<g id="edge47" class="edge">
 <title>26&#45;&gt;22</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5648.4,-674.32C5666.34,-727.98 5693.98,-810.68 5719.14,-885.95"/>
-<polygon fill="black" stroke="black" points="5715.86,-887.19 5722.35,-895.57 5722.5,-884.98 5715.86,-887.19"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M5299.25,-627.62C5311.1,-653.36 5325.77,-685.25 5340.8,-717.91"/>
+<polygon fill="black" stroke="black" points="5337.69,-719.52 5345.05,-727.14 5344.05,-716.59 5337.69,-719.52"/>
 </g>
 <!-- 27&#45;&gt;28 -->
-<g id="edge49" class="edge">
+<g id="edge50" class="edge">
 <title>27&#45;&gt;28</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1739,-686.65C1738.09,-720.84 1737.55,-764.28 1737.38,-809.38"/>
-<polygon fill="black" stroke="black" points="1733.88,-809.63 1737.35,-819.64 1740.88,-809.65 1733.88,-809.63"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1531.71,-966.05C1530.79,-1000.24 1530.25,-1043.68 1530.09,-1088.78"/>
+<polygon fill="black" stroke="black" points="1526.59,-1089.03 1530.06,-1099.04 1533.59,-1089.05 1526.59,-1089.03"/>
 </g>
 <!-- 28&#45;&gt;2 -->
-<g id="edge50" class="edge">
+<g id="edge51" class="edge">
 <title>28&#45;&gt;2</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2005.37,-1303.27C2008.26,-1304.56 2011.16,-1305.8 2014.08,-1307 2125.41,-1352.8 2931.41,-1366.83 3236.49,-1370.53"/>
-<polygon fill="black" stroke="black" points="3236.65,-1374.03 3246.69,-1370.65 3236.73,-1367.03 3236.65,-1374.03"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1798.07,-1582.67C1800.97,-1583.96 1803.87,-1585.2 1806.78,-1586.4 1918.12,-1632.2 2724.11,-1646.23 3029.19,-1649.93"/>
+<polygon fill="black" stroke="black" points="3029.35,-1653.43 3039.39,-1650.05 3029.44,-1646.43 3029.35,-1653.43"/>
 </g>
 <!-- 28&#45;&gt;27 -->
-<g id="edge48" class="edge">
+<g id="edge49" class="edge">
 <title>28&#45;&gt;27</title>
-<path fill="none" stroke="black" d="M1750.8,-819.64C1750.7,-776.23 1750.25,-733.83 1749.46,-699.09"/>
-<polygon fill="black" stroke="black" points="1749.45,-698.64 1745.3,-692.74 1749.15,-686.65 1753.3,-692.55 1749.45,-698.64"/>
+<path fill="none" stroke="black" d="M1543.51,-1099.04C1543.41,-1055.63 1542.96,-1013.23 1542.17,-978.49"/>
+<polygon fill="black" stroke="black" points="1542.16,-978.04 1538.01,-972.14 1541.86,-966.05 1546.01,-971.95 1542.16,-978.04"/>
+</g>
+<!-- 29&#45;&gt;27 -->
+<g id="edge52" class="edge">
+<title>29&#45;&gt;27</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2084.15,-669.57C2066.13,-677.57 2047.81,-684.85 2029.78,-690.8 1929.86,-723.79 1894.16,-689.46 1795.78,-726.8 1737.97,-748.75 1679.57,-784.93 1632.9,-818.02"/>
+<polygon fill="black" stroke="black" points="1630.72,-815.28 1624.63,-823.95 1634.8,-820.97 1630.72,-815.28"/>
+</g>
+<!-- 29&#45;&gt;28 -->
+<g id="edge53" class="edge">
+<title>29&#45;&gt;28</title>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2165.5,-669.79C2066.17,-775.95 1905.08,-948.1 1770.84,-1091.57"/>
+<polygon fill="black" stroke="black" points="1767.93,-1089.55 1763.66,-1099.24 1773.05,-1094.33 1767.93,-1089.55"/>
 </g>
 </g>
 </svg>