Merge pull request #1200 from thesandboxgame/feat/marketplace-remove-…

…asset-matcher

Feat/marketplace remove asset matcher

packages/deploy/deploy/marketplace/10_deploy_exchange.ts

@@ -17,7 +17,6 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   }
   const orderValidator = await deployments.get('OrderValidator');
   const royaltiesRegistry = await deployments.get('RoyaltiesRegistry');
-  const assetMatcher = await deployments.get('AssetMatcher');
 
   const newProtocolFeePrimary = 0;
   const newProtocolFeeSecondary = 250;
@@ -38,7 +37,6 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
           exchangeFeeRecipient,
           royaltiesRegistry.address,
           orderValidator.address,
-          assetMatcher.address,
         ],
       },
       upgradeIndex: 0,
@@ -49,8 +47,4 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
 };
 export default func;
 func.tags = ['Exchange', 'Exchange_deploy'];
-func.dependencies = [
-  'RoyaltiesRegistry_deploy',
-  'OrderValidator_deploy',
-  'AssetMatcher_deploy',
-];
+func.dependencies = ['RoyaltiesRegistry_deploy', 'OrderValidator_deploy'];

packages/deploy/hardhat.config.ts

@@ -13,7 +13,6 @@ const importedPackages = {
     'contracts/royalties-registry/RoyaltiesRegistry.sol',
     'contracts/exchange/OrderValidator.sol',
     'contracts/exchange/Exchange.sol',
-    'contracts/exchange/AssetMatcher.sol',
   ],
 };
 

packages/marketplace/contracts/exchange/Exchange.sol

@@ -9,7 +9,6 @@ import {ContextUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/Cont
 import {ERC165Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/introspection/ERC165Upgradeable.sol";
 import {ERC2771HandlerUpgradeable} from "@sandbox-smart-contracts/dependency-metatx/contracts/ERC2771HandlerUpgradeable.sol";
 import {IOrderValidator} from "../interfaces/IOrderValidator.sol";
-import {IAssetMatcher} from "../interfaces/IAssetMatcher.sol";
 import {TransferManager, IRoyaltiesProvider} from "../transfer-manager/TransferManager.sol";
 import {LibOrder} from "../lib-order/LibOrder.sol";
 import {ExchangeCore} from "./ExchangeCore.sol";
@@ -52,7 +51,6 @@ contract Exchange is
     /// @param newDefaultFeeReceiver market fee receiver
     /// @param newRoyaltiesProvider registry for the different types of royalties
     /// @param orderValidatorAddress new OrderValidator contract address
-    /// @param newAssetMatcher new AssetMatcher contract address
     // solhint-disable-next-line func-name-mixedcase
     function __Exchange_init(
         address admin,
@@ -61,8 +59,7 @@ contract Exchange is
         uint256 newProtocolFeeSecondary,
         address newDefaultFeeReceiver,
         IRoyaltiesProvider newRoyaltiesProvider,
-        IOrderValidator orderValidatorAddress,
-        IAssetMatcher newAssetMatcher
+        IOrderValidator orderValidatorAddress
     ) external initializer {
         __ERC2771Handler_init_unchained(newTrustedForwarder);
         __AccessControl_init_unchained();
@@ -73,7 +70,7 @@ contract Exchange is
             newDefaultFeeReceiver,
             newRoyaltiesProvider
         );
-        __ExchangeCoreInitialize(orderValidatorAddress, newAssetMatcher);
+        __ExchangeCoreInitialize(orderValidatorAddress);
         _grantRole(DEFAULT_ADMIN_ROLE, admin);
     }
 
@@ -109,12 +106,6 @@ contract Exchange is
         _setRoyaltiesRegistry(newRoyaltiesRegistry);
     }
 
-    /// @notice set AssetMatcher address
-    /// @param contractAddress new AssetMatcher contract address
-    function setAssetMatcherContract(IAssetMatcher contractAddress) external onlyRole(DEFAULT_ADMIN_ROLE) {
-        _setAssetMatcherContract(contractAddress);
-    }
-
     /// @notice set OrderValidator address
     /// @param contractAddress new OrderValidator contract address
     function setOrderValidatorContract(IOrderValidator contractAddress) external onlyRole(DEFAULT_ADMIN_ROLE) {

packages/marketplace/contracts/exchange/ExchangeCore.sol

@@ -4,7 +4,6 @@ pragma solidity 0.8.21;
 
 import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 import {LibFill} from "./libraries/LibFill.sol";
-import {IAssetMatcher} from "../interfaces/IAssetMatcher.sol";
 import {TransferExecutor} from "../transfer-manager/TransferExecutor.sol";
 import {LibAsset} from "../lib-asset/LibAsset.sol";
 import {LibOrder} from "../lib-order/LibOrder.sol";
@@ -24,10 +23,6 @@ abstract contract ExchangeCore is Initializable, TransferExecutor, ITransferMana
         bytes signatureRight; // signature for the right order
     }
 
-    /// @notice AssetMatcher contract
-    /// @return AssetMatcher address
-    IAssetMatcher public assetMatcher;
-
     /// @notice OrderValidator contract
     /// @return OrderValidator address
     IOrderValidator public orderValidator;
@@ -60,29 +55,14 @@ abstract contract ExchangeCore is Initializable, TransferExecutor, ITransferMana
         uint256 valueLeft,
         uint256 valueRight
     );
-    event AssetMatcherSet(IAssetMatcher indexed contractAddress);
     event OrderValidatorSet(IOrderValidator indexed contractAddress);
 
     /// @notice initializer for ExchangeCore
     /// @param newOrderValidatorAddress new OrderValidator contract address
-    /// @param newAssetMatcher new AssetMatcher contract address
     /// @dev initialize permissions for native token exchange
     // solhint-disable-next-line func-name-mixedcase
-    function __ExchangeCoreInitialize(
-        IOrderValidator newOrderValidatorAddress,
-        IAssetMatcher newAssetMatcher
-    ) internal onlyInitializing {
+    function __ExchangeCoreInitialize(IOrderValidator newOrderValidatorAddress) internal onlyInitializing {
         _setOrderValidatorContract(newOrderValidatorAddress);
-        _setAssetMatcherContract(newAssetMatcher);
-    }
-
-    /// @notice set AssetMatcher address
-    /// @param contractAddress new AssetMatcher contract address
-    /// @dev matches assets between left and right order
-    function _setAssetMatcherContract(IAssetMatcher contractAddress) internal {
-        require(address(contractAddress) != address(0), "invalid asset matcher");
-        assetMatcher = contractAddress;
-        emit AssetMatcherSet(contractAddress);
     }
 
     /// @notice set OrderValidator address
@@ -152,12 +132,17 @@ abstract contract ExchangeCore is Initializable, TransferExecutor, ITransferMana
         LibOrder.Order calldata orderLeft,
         LibOrder.Order calldata orderRight
     ) internal {
-        (LibAsset.AssetType memory makeMatch, LibAsset.AssetType memory takeMatch) = _matchAssets(
-            orderLeft,
-            orderRight
+        LibAsset.AssetType memory makeMatch = LibAsset.matchAssets(
+            orderLeft.makeAsset.assetType,
+            orderRight.takeAsset.assetType
+        );
+        LibAsset.AssetType memory takeMatch = LibAsset.matchAssets(
+            orderLeft.takeAsset.assetType,
+            orderRight.makeAsset.assetType
         );
 
         LibFill.FillResult memory newFill = _parseOrdersSetFillEmitMatch(sender, orderLeft, orderRight);
+
         doTransfers(
             ITransferManager.DealSide({
                 asset: LibAsset.Asset({assetType: makeMatch, value: newFill.leftValue}),
@@ -234,19 +219,5 @@ abstract contract ExchangeCore is Initializable, TransferExecutor, ITransferMana
         }
     }
 
-    /// @notice match assets from orders
-    /// @param orderLeft left order
-    /// @param orderRight right order
-    /// @dev each make asset must correrspond to the other take asset and be different from 0
-    function _matchAssets(
-        LibOrder.Order memory orderLeft,
-        LibOrder.Order memory orderRight
-    ) internal view returns (LibAsset.AssetType memory makeMatch, LibAsset.AssetType memory takeMatch) {
-        makeMatch = assetMatcher.matchAssets(orderLeft.makeAsset.assetType, orderRight.takeAsset.assetType);
-        require(makeMatch.assetClass != LibAsset.AssetClassType.INVALID_ASSET_CLASS, "assets don't match");
-        takeMatch = assetMatcher.matchAssets(orderLeft.takeAsset.assetType, orderRight.makeAsset.assetType);
-        require(takeMatch.assetClass != LibAsset.AssetClassType.INVALID_ASSET_CLASS, "assets don't match");
-    }
-
     uint256[49] private __gap;
 }

packages/marketplace/contracts/lib-asset/LibAsset.sol

@@ -49,16 +49,38 @@ library LibAsset {
         return FeeSide.NONE;
     }
 
+    /// @notice calculate if Asset types match with each other
+    /// @param leftType to be matched with rightAssetType
+    /// @param rightType to be matched with leftAssetType
+    /// @return AssetType of the match
+    function matchAssets(
+        AssetType calldata leftType,
+        AssetType calldata rightType
+    ) internal pure returns (AssetType memory) {
+        AssetClassType classLeft = leftType.assetClass;
+        AssetClassType classRight = rightType.assetClass;
+
+        require(classLeft != AssetClassType.INVALID_ASSET_CLASS, "not found IAssetMatcher");
+        require(classRight != AssetClassType.INVALID_ASSET_CLASS, "not found IAssetMatcher");
+        require(classLeft == classRight, "assets don't match");
+
+        bytes32 leftHash = keccak256(leftType.data);
+        bytes32 rightHash = keccak256(rightType.data);
+        require(leftHash == rightHash, "assets don't match");
+
+        return leftType;
+    }
+
     /// @notice calculate hash of asset type
     /// @param assetType to be hashed
     /// @return hash of assetType
     function hash(AssetType memory assetType) internal pure returns (bytes32) {
         return keccak256(abi.encode(ASSET_TYPE_TYPEHASH, assetType.assetClass, keccak256(assetType.data)));
     }
 
-    /// @notice calculate hash of asset
-    /// @param asset to be hashed
-    /// @return hash of asset
+    ///    @notice calculate hash of asset
+    ///    @param asset to be hashed
+    ///    @return hash of asset
     function hash(Asset memory asset) internal pure returns (bytes32) {
         return keccak256(abi.encode(ASSET_TYPEHASH, hash(asset.assetType), asset.value));
     }

packages/marketplace/contracts/mocks/LibAssetTest.sol

@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity 0.8.21;
+
+import {LibAsset} from "../lib-asset/LibAsset.sol";
+
+contract LibAssetTest {
+    function getFeeSide(
+        LibAsset.AssetClassType leftClass,
+        LibAsset.AssetClassType rightClass
+    ) external pure returns (LibAsset.FeeSide) {
+        return LibAsset.getFeeSide(leftClass, rightClass);
+    }
+
+    /// @notice calculate if Asset types match with each other
+    /// @param leftType to be matched with rightAssetType
+    /// @param rightType to be matched with leftAssetType
+    /// @return AssetType of the match
+    function matchAssets(
+        LibAsset.AssetType calldata leftType,
+        LibAsset.AssetType calldata rightType
+    ) external pure returns (LibAsset.AssetType memory) {
+        return LibAsset.matchAssets(leftType, rightType);
+    }
+
+    ///    @notice calculate hash of asset type
+    ///    @param assetType to be hashed
+    ///    @return hash of assetType
+    function hash(LibAsset.AssetType memory assetType) external pure returns (bytes32) {
+        return LibAsset.hash(assetType);
+    }
+
+    ///    @notice calculate hash of asset
+    ///    @param asset to be hashed
+    ///    @return hash of asset
+    function hash(LibAsset.Asset memory asset) external pure returns (bytes32) {
+        return LibAsset.hash(asset);
+    }
+}