Merge branch 'feature/add-isDatasetCompatibleWithDeal-function' into feature/add-isDatasetCompatibleWithDeal-function-part2

Author: Le-Caignec

contracts/facets/IexecPoco1Facet.sol

@@ -48,13 +48,13 @@ contract IexecPoco1Facet is IexecPoco1, FacetBase, IexecEscrow, SignatureVerifie
         return _verifySignatureOrPresignature(_identity, _hash, _signature);
     }
 
-    /***************************************************************************
-     *                  ODB DatasetOrder compatibility with a deal              *
-     ***************************************************************************/
     /**
      * @notice Public view function to check if a dataset order is compatible with a deal.
      * This function performs all the necessary checks to verify dataset order compatibility with a deal.
      *
+     * @dev This function is mainly consumed by offchain clients. It should be carefully inspected if used inside on-chain code.
+     * This function should not be used in matchOrders as it does not check the same requirements.
+     *
      * @param datasetOrder The dataset order to verify
      * @param dealid The deal ID to check against
      * @return true if the dataset order is compatible with the deal, false otherwise
@@ -79,7 +79,7 @@ contract IexecPoco1Facet is IexecPoco1, FacetBase, IexecEscrow, SignatureVerifie
         IexecLibCore_v5.Deal storage deal = $.m_deals[dealid];
         dealExists = (deal.requester != address(0));
 
-        // Check if deal dataset is address 0 (no dataset in deal)
+        // The specified deal should not have a dataset.
         dealHasNoDataset = (deal.dataset.pointer == address(0));
 
         // Check dataset order owner signature (including presign and EIP1271)

scripts/upgrades/deploy-and-update-some-facet.ts

@@ -58,7 +58,7 @@ import { printFunctions } from './upgrade-helper';
     console.log('Deploying new IexecPocoAccessorsFacet...');
     const iexecPocoAccessorsFacetFactory = new IexecPocoAccessorsFacet__factory(iexecLibOrders);
     const iexecPocoAccessorsFacet = await factoryDeployer.deployContract(
-        iexecPocoAccessorsFacetFactory,
+        new IexecPocoAccessorsFacet__factory(iexecLibOrders),
     );
 
     console.log('Deploying new IexecPoco1Facet...');