Add match orders boost feature on voucher

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Changelog
 
 ## vNEXT
+- Match orders boost through voucher. (#16)
 - Use hardhat deploy. (#15)
 - Upload coverage reports to Codecov. (#14)
 - Clean some TODOs. (#13)

contracts/beacon/IVoucher.sol

@@ -9,6 +9,7 @@ interface IVoucher {
     event AccountAuthorized(address indexed account);
     event AccountUnauthorized(address indexed account);
     event OrdersMatchedWithVoucher(bytes32 dealId);
+    event OrdersBoostMatchedWithVoucher(bytes32 dealId);
 
     function authorizeAccount(address account) external;
     function unauthorizeAccount(address account) external;
@@ -18,6 +19,12 @@ interface IVoucher {
         IexecLibOrders_v5.WorkerpoolOrder calldata workerpoolOrder,
         IexecLibOrders_v5.RequestOrder calldata requestOrder
     ) external returns (bytes32);
+    function matchOrdersBoost(
+        IexecLibOrders_v5.AppOrder calldata appOrder,
+        IexecLibOrders_v5.DatasetOrder calldata datasetOrder,
+        IexecLibOrders_v5.WorkerpoolOrder calldata workerpoolOrder,
+        IexecLibOrders_v5.RequestOrder calldata requestOrder
+    ) external returns (bytes32);
 
     function getVoucherHub() external view returns (address);
     function getType() external view returns (uint256);

contracts/beacon/Voucher.sol

@@ -5,6 +5,7 @@ pragma solidity ^0.8.20;
 
 import {IexecLibOrders_v5} from "@iexec/poco/contracts/libs/IexecLibOrders_v5.sol";
 import {IexecPoco1} from "@iexec/poco/contracts/modules/interfaces/IexecPoco1.v8.sol";
+import {IexecPocoBoost} from "@iexec/poco/contracts/modules/interfaces/IexecPocoBoost.sol";
 import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import {IVoucherHub} from "../IVoucherHub.sol";
@@ -29,6 +30,21 @@ contract Voucher is OwnableUpgradeable, IVoucher {
         mapping(bytes32 dealId => uint256) _sponsoredAmounts;
     }
 
+    modifier onlyAuthorized() {
+        VoucherStorage storage $ = _getVoucherStorage();
+        require(
+            msg.sender == owner() || $._authorizedAccounts[msg.sender],
+            "Voucher: sender is not authorized"
+        );
+        _;
+    }
+
+    modifier onlyNotExpired() {
+        VoucherStorage storage $ = _getVoucherStorage();
+        require(block.timestamp < $._expiration, "Voucher: voucher is expired");
+        _;
+    }
+
     /// @custom:oz-upgrades-unsafe-allow constructor
     constructor() {
         _disableInitializers();
@@ -91,31 +107,18 @@ contract Voucher is OwnableUpgradeable, IVoucher {
     ) external returns (bytes32 dealId) {
         // TODO add onlyAuthorized
         // TODO check expiration
-        uint256 appPrice = appOrder.appprice;
-        uint256 datasetPrice = datasetOrder.datasetprice;
-        uint256 workerpoolPrice = workerpoolOrder.workerpoolprice;
         VoucherStorage storage $ = _getVoucherStorage();
         IVoucherHub voucherHub = IVoucherHub($._voucherHub);
-        uint256 sponsoredAmount = voucherHub.debitVoucher(
+        address iexecPoco = voucherHub.getIexecPoco();
+        uint256 sponsoredAmount = _debitVoucherAndTransferNonSponsoredAmount(
             $._type,
-            appOrder.app,
-            appPrice,
-            datasetOrder.dataset,
-            datasetPrice,
-            workerpoolOrder.workerpool,
-            workerpoolPrice
+            $._voucherHub,
+            iexecPoco,
+            appOrder,
+            datasetOrder,
+            workerpoolOrder,
+            requestOrder
         );
-        uint256 dealPrice = appPrice + datasetPrice + workerpoolPrice;
-        address iexecPoco = voucherHub.getIexecPoco();
-        if (sponsoredAmount != dealPrice) {
-            // Transfer non-sponsored amount from the iExec account of the
-            // requester to the iExec account of the voucher
-            IERC20(iexecPoco).transferFrom(
-                requestOrder.requester,
-                address(this),
-                dealPrice - sponsoredAmount
-            );
-        }
         dealId = IexecPoco1(iexecPoco).sponsorMatchOrders(
             appOrder,
             datasetOrder,
@@ -127,6 +130,45 @@ contract Voucher is OwnableUpgradeable, IVoucher {
         return dealId;
     }
 
+    /**
+     * Match orders boost on Poco. Eligible assets prices will be debited from the
+     * voucher if possible, then non-sponsored amount will be debited from the
+     * iExec account of the requester.
+     *
+     * @param appOrder The app order.
+     * @param datasetOrder The dataset order.
+     * @param workerpoolOrder The workerpool order.
+     * @param requestOrder The request order.
+     */
+    function matchOrdersBoost(
+        IexecLibOrders_v5.AppOrder calldata appOrder,
+        IexecLibOrders_v5.DatasetOrder calldata datasetOrder,
+        IexecLibOrders_v5.WorkerpoolOrder calldata workerpoolOrder,
+        IexecLibOrders_v5.RequestOrder calldata requestOrder
+    ) external onlyAuthorized onlyNotExpired returns (bytes32 dealId) {
+        VoucherStorage storage $ = _getVoucherStorage();
+        IVoucherHub voucherHub = IVoucherHub($._voucherHub);
+        address iexecPoco = voucherHub.getIexecPoco();
+        uint256 sponsoredAmount = _debitVoucherAndTransferNonSponsoredAmount(
+            $._type,
+            $._voucherHub,
+            iexecPoco,
+            appOrder,
+            datasetOrder,
+            workerpoolOrder,
+            requestOrder
+        );
+        dealId = IexecPocoBoost(iexecPoco).sponsorMatchOrdersBoost(
+            appOrder,
+            datasetOrder,
+            workerpoolOrder,
+            requestOrder
+        );
+        $._sponsoredAmounts[dealId] = sponsoredAmount;
+        emit OrdersBoostMatchedWithVoucher(dealId);
+        return dealId;
+    }
+
     /**
      * Retrieve the address of the voucher hub associated with the voucher.
      * @return voucherHubAddress The address of the voucher hub.
@@ -196,4 +238,50 @@ contract Voucher is OwnableUpgradeable, IVoucher {
             $.slot := VOUCHER_STORAGE_LOCATION
         }
     }
+
+    /**
+     * @dev Debit voucher and transfer non-sponsored amount from requester's account.
+     *
+     * @param appOrder The app order.
+     * @param datasetOrder The dataset order.
+     * @param workerpoolOrder The workerpool order.
+     * @param requestOrder The request order.
+     *
+     * @return sponsoredAmount The amount sponsored by the voucher.
+     */
+    function _debitVoucherAndTransferNonSponsoredAmount(
+        uint256 voucherTypeId,
+        address voucherHub,
+        address iexecPoco,
+        IexecLibOrders_v5.AppOrder calldata appOrder,
+        IexecLibOrders_v5.DatasetOrder calldata datasetOrder,
+        IexecLibOrders_v5.WorkerpoolOrder calldata workerpoolOrder,
+        IexecLibOrders_v5.RequestOrder calldata requestOrder
+    ) private returns (uint256 sponsoredAmount) {
+        uint256 appPrice = appOrder.appprice;
+        uint256 datasetPrice = datasetOrder.datasetprice;
+        uint256 workerpoolPrice = workerpoolOrder.workerpoolprice;
+
+        sponsoredAmount = IVoucherHub(voucherHub).debitVoucher(
+            voucherTypeId,
+            appOrder.app,
+            appPrice,
+            datasetOrder.dataset,
+            datasetPrice,
+            workerpoolOrder.workerpool,
+            workerpoolPrice
+        );
+        // TODO: Compute volume and set dealPrice = taskPrice * volume instead of curent dealPrice
+        uint256 dealPrice = appPrice + datasetPrice + workerpoolPrice;
+
+        if (sponsoredAmount != dealPrice) {
+            // Transfer non-sponsored amount from the iExec account of the
+            // requester to the iExec account of the voucher
+            IERC20(iexecPoco).transferFrom(
+                requestOrder.requester,
+                address(this),
+                dealPrice - sponsoredAmount
+            );
+        }
+    }
 }

contracts/mocks/IexecPocoMock.sol

@@ -11,6 +11,7 @@ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
  */
 contract IexecPocoMock is ERC20 {
     bool public shouldRevertOnSponsorMatchOrders = false;
+    bool public shouldRevertOnSponsorMatchOrdersBoost = false;
 
     constructor() ERC20("Staked RLC", "SRLC") {
         _mint(msg.sender, 1000000);
@@ -32,7 +33,26 @@ contract IexecPocoMock is ERC20 {
         return keccak256("deal");
     }
 
+    function sponsorMatchOrdersBoost(
+        IexecLibOrders_v5.AppOrder calldata appOrder,
+        IexecLibOrders_v5.DatasetOrder calldata datasetOrder,
+        IexecLibOrders_v5.WorkerpoolOrder calldata workerpoolOrder,
+        IexecLibOrders_v5.RequestOrder calldata
+    ) external returns (bytes32 dealId) {
+        if (shouldRevertOnSponsorMatchOrdersBoost) {
+            revert("IexecPocoMock: Failed to sponsorMatchOrdersBoost");
+        }
+        _burn(
+            msg.sender,
+            appOrder.appprice + datasetOrder.datasetprice + workerpoolOrder.workerpoolprice
+        );
+        return keccak256("deal");
+    }
+
     function willRevertOnSponsorMatchOrders() external {
         shouldRevertOnSponsorMatchOrders = true;
     }
+    function willRevertOnSponsorMatchOrdersBoost() external {
+        shouldRevertOnSponsorMatchOrdersBoost = true;
+    }
 }