feat: remove collateral swap approve process & add eth support & calculate the exact price after fee

Signed-off-by: GopherJ <alex_cj96@foxmail.com>

Author: 0x8f701

contracts/misc/marketplaces/LooksRareAdapter.sol

@@ -65,12 +65,14 @@ contract LooksRareAdapter is IMarketplace {
             itemType = ItemType.NATIVE;
             token = address(0);
         }
+        uint256 minPrice = (makerAsk.price * makerAsk.minPercentageToAsk) /
+            10000;
         consideration[0] = ConsiderationItem(
             itemType,
             token,
             0,
-            makerAsk.price, // TODO: take minPercentageToAsk into account
-            makerAsk.price,
+            minPrice,
+            minPrice,
             payable(takerBid.taker)
         );
         orderInfo.id = abi.encodePacked(makerAsk.r, makerAsk.s, makerAsk.v);

contracts/misc/marketplaces/X2Y2Adapter.sol

@@ -18,6 +18,8 @@ import {IPoolAddressesProvider} from "../../interfaces/IPoolAddressesProvider.so
 contract X2Y2Adapter is IMarketplace {
     IPoolAddressesProvider public immutable ADDRESSES_PROVIDER;
 
+    uint256 public constant RATE_BASE = 1e6;
+
     constructor(IPoolAddressesProvider provider) {
         ADDRESSES_PROVIDER = provider;
     }
@@ -66,6 +68,14 @@ contract X2Y2Adapter is IMarketplace {
 
         ConsiderationItem[] memory consideration = new ConsiderationItem[](1);
 
+        uint256 totalFee;
+        for (uint256 i = 0; i < detail.fees.length; i++) {
+            IX2Y2.Fee memory fee = detail.fees[i];
+            uint256 amount = (detail.price * fee.percentage) / RATE_BASE;
+            totalFee += amount;
+        }
+        detail.price -= totalFee;
+
         ItemType itemType = ItemType.ERC20;
         address token = order.currency;
         consideration[0] = ConsiderationItem(
@@ -76,6 +86,7 @@ contract X2Y2Adapter is IMarketplace {
             detail.price,
             payable(order.user)
         );
+
         orderInfo.id = abi.encodePacked(order.r, order.s, order.v);
         orderInfo.consideration = consideration;
     }

contracts/protocol/libraries/logic/MarketplaceLogic.sol

@@ -50,12 +50,6 @@ library MarketplaceLogic {
         uint16 indexed referralCode
     );
 
-    /**
-     * @dev Default percentage of listing price to be supplied on behalf of the seller in a marketplace exchange.
-     * Expressed in bps, a value of 0.9e4 results in 90.00%
-     */
-    uint256 internal constant DEFAULT_SUPPLY_RATIO = 0.9e4;
-
     event BuyWithCredit(
         bytes32 indexed marketplaceId,
         DataTypes.OrderInfo orderInfo,
@@ -158,7 +152,7 @@ library MarketplaceLogic {
             )
         );
 
-        _handleFlashSupplyRepayment(vars, params.orderInfo.maker);
+        _handleFlashSupplyRepayment(params, vars, address(this));
         _handleFlashLoanRepayment(ps, params, vars, params.orderInfo.taker);
 
         emit BuyWithCredit(
@@ -356,7 +350,7 @@ library MarketplaceLogic {
             )
         );
 
-        _handleFlashSupplyRepayment(vars, params.orderInfo.taker);
+        _handleFlashSupplyRepayment(params, vars, address(this));
         _handleFlashLoanRepayment(ps, params, vars, params.orderInfo.maker);
 
         emit AcceptBidWithCredit(
@@ -446,11 +440,11 @@ library MarketplaceLogic {
         MarketplaceLocalVars memory vars,
         address seller
     ) internal {
-        if (vars.isETH) {
-            return; // impossible to supply ETH on behalf of the
+        DataTypes.ReserveData storage reserve = ps._reserves[vars.creditToken];
+        if (reserve.xTokenAddress == address(0)) {
+            return;
         }
 
-        DataTypes.ReserveData storage reserve = ps._reserves[vars.creditToken];
         DataTypes.UserConfigurationMap storage sellerConfig = ps._usersConfig[
             seller
         ];
@@ -459,31 +453,25 @@ library MarketplaceLogic {
 
         reserve.updateState(reserveCache);
 
-        uint256 supplyAmount = Math.min(
-            IERC20(vars.creditToken).allowance(seller, address(this)),
-            vars.price.percentMul(DEFAULT_SUPPLY_RATIO)
-        );
-        if (supplyAmount == 0) {
-            return;
-        }
+        vars.supplyAmount = vars.price;
 
         ValidationLogic.validateSupply(
             reserveCache,
-            supplyAmount,
+            vars.supplyAmount,
             DataTypes.AssetType.ERC20
         );
 
         reserve.updateInterestRates(
             reserveCache,
             vars.creditToken,
-            supplyAmount,
+            vars.supplyAmount,
             0
         );
 
         bool isFirstSupply = IPToken(reserveCache.xTokenAddress).mint(
             msg.sender,
             seller,
-            supplyAmount,
+            vars.supplyAmount,
             reserveCache.nextLiquidityIndex
         );
 
@@ -496,12 +484,9 @@ library MarketplaceLogic {
             vars.creditToken,
             msg.sender,
             seller,
-            supplyAmount,
+            vars.supplyAmount,
             params.referralCode
         );
-
-        // set supplyAmount for future repayment
-        vars.supplyAmount = supplyAmount;
     }
 
     /**
@@ -608,19 +593,25 @@ library MarketplaceLogic {
     /**
      * @notice "Repay" minted pToken by transferring funds from the seller to xTokenAddress
      * @dev
+     * @param params The additional parameters needed to execute the buyWithCredit/acceptBidWithCredit function
      * @param vars The marketplace local vars for caching storage values for future reads
-     * @param seller The NFT seller
+     * @param recipient The ERC20 recipient
      */
     function _handleFlashSupplyRepayment(
+        DataTypes.ExecuteMarketplaceParams memory params,
         MarketplaceLocalVars memory vars,
-        address seller
+        address recipient
     ) internal {
-        if (vars.isETH || vars.supplyAmount == 0) {
+        if (vars.supplyAmount == 0) {
             return;
         }
 
+        if (vars.isETH) {
+            IWETH(params.weth).deposit{value: vars.supplyAmount}();
+        }
+
         IERC20(vars.creditToken).safeTransferFrom(
-            seller,
+            recipient,
             vars.creditXTokenAddress,
             vars.supplyAmount
         );
@@ -702,7 +693,7 @@ library MarketplaceLogic {
     function _validateAndGetPrice(
         DataTypes.ExecuteMarketplaceParams memory params,
         MarketplaceLocalVars memory vars
-    ) internal pure returns (uint256 price) {
+    ) internal view returns (uint256 price) {
         for (uint256 i = 0; i < params.orderInfo.consideration.length; i++) {
             ConsiderationItem memory item = params.orderInfo.consideration[i];
             require(
@@ -718,7 +709,7 @@ library MarketplaceLogic {
                 item.token == params.credit.token,
                 Errors.CREDIT_DOES_NOT_MATCH_ORDER
             );
-            price += item.startAmount;
+            if (item.recipient == address(this)) price += item.startAmount;
         }
     }
 }