Merge pull request #52 from valory-xyz/marketplace_proxy

refactor: marketplace proxy

contracts/AgentMech.sol

@@ -15,14 +15,6 @@ interface IERC721 {
     function ownerOf(uint256 tokenId) external view returns (address tokenOwner);
 }
 
-// Mech manager interface
-interface IMechManager {
-    /// @dev Gets the status of mech marketplace.
-    /// @param mechMarketplace Mech marketplace address.
-    /// @return status True, if the marketplace is whitelisted.
-    function mapMechMarketplaces(address mechMarketplace) external view returns (bool status);
-}
-
 /// @dev A Mech that is operated by the multisig of an Olas service
 contract OlasMech is Mech, IErrorsMech, ImmutableStorage {
     /// @param _serviceRegistry Address of the registry contract.
@@ -103,8 +95,8 @@ contract AgentMech is OlasMech {
     bytes32 public immutable domainSeparator;
     // Original chain Id
     uint256 public immutable chainId;
-    // Mech Manager address
-    address public immutable mechManager;
+    // Mech marketplace address
+    address public immutable mechMarketplace;
 
     // Minimum required price
     uint256 public price;
@@ -131,11 +123,11 @@ contract AgentMech is OlasMech {
     mapping(address => uint256) public mapNonces;
 
     /// @dev AgentMech constructor.
-    /// @param _mechManager Mech manager address.
+    /// @param _mechMarketplace Mech marketplace address.
     /// @param _serviceRegistry Address of the token contract.
     /// @param _serviceId Service Id.
     /// @param _price The minimum required price.
-    constructor(address _mechManager, address _serviceRegistry, uint256 _serviceId, uint256 _price)
+    constructor(address _mechMarketplace, address _serviceRegistry, uint256 _serviceId, uint256 _price)
         OlasMech(_serviceRegistry, _serviceId)
     {
         // Check for the token to have the owner
@@ -144,7 +136,7 @@ contract AgentMech is OlasMech {
             revert AgentNotFound(_serviceId);
         }
 
-        mechManager = _mechManager;
+        mechMarketplace = _mechMarketplace;
         // Record the price
         price = _price;
 
@@ -252,10 +244,9 @@ contract AgentMech is OlasMech {
 
     /// @dev Delivers a request.
     /// @notice This function ultimately calls mech marketplace contract to finalize the delivery.
-    /// @param mechMarketplace Mech marketplace address.
     /// @param requestId Request id.
     /// @param data Self-descriptive opaque data-blob.
-    function _deliver(address mechMarketplace, uint256 requestId, bytes memory data) internal returns (bytes memory requestData) {
+    function _deliver(uint256 requestId, bytes memory data) internal returns (bytes memory requestData) {
         // Get an account to deliver request to
         address account = mapRequestAddresses[requestId];
 
@@ -301,7 +292,7 @@ contract AgentMech is OlasMech {
     function requestFromMarketplace(address account, uint256 payment, bytes memory data, uint256 requestId) external {
         // TODO Shall the mech marketplace be checked for being whitelisted by mechManager? Now it's enforced
         // Check for marketplace access
-        if (!IMechManager(mechManager).mapMechMarketplaces(msg.sender)) {
+        if (msg.sender != mechMarketplace) {
             revert MarketplaceNotAuthorized(msg.sender);
         }
 
@@ -314,7 +305,7 @@ contract AgentMech is OlasMech {
     /// @param requestId Request Id.
     function revokeRequest(uint256 requestId) external {
         // Check for marketplace access
-        if (!IMechManager(mechManager).mapMechMarketplaces(msg.sender)) {
+        if (msg.sender != mechMarketplace) {
             revert MarketplaceNotAuthorized(msg.sender);
         }
 
@@ -332,13 +323,11 @@ contract AgentMech is OlasMech {
 
     /// @dev Delivers a request by a marketplace.
     /// @notice This function ultimately calls mech marketplace contract to finalize the delivery.
-    /// @param mechMarketplace Mech marketplace address.
     /// @param requestId Request id.
     /// @param data Self-descriptive opaque data-blob.
     /// @param mechStakingInstance Mech staking instance address (optional).
     /// @param mechServiceId Mech operator service Id.
     function deliverToMarketplace(
-        address mechMarketplace,
         uint256 requestId,
         bytes memory data,
         address mechStakingInstance,
@@ -350,13 +339,8 @@ contract AgentMech is OlasMech {
         }
         _locked = 2;
 
-        // Check for marketplace access
-        if (!IMechManager(mechManager).mapMechMarketplaces(mechMarketplace)) {
-            revert MarketplaceNotAuthorized(mechMarketplace);
-        }
-
         // Request delivery
-        bytes memory requestData = _deliver(mechMarketplace, requestId, data);
+        bytes memory requestData = _deliver(requestId, data);
 
         // Mech marketplace delivery finalization if the request was not delivered already
         if (requestData.length > 0) {

contracts/Karma.sol

@@ -37,7 +37,6 @@ contract Karma {
     // Contract owner
     address public owner;
 
-    // TODO This must be fetched from mech manager and be removed / inaccessible from here
     // Mapping of whitelisted marketplaces
     mapping(address => bool) public mapMechMarketplaces;
     // Mapping of mech address => karma
@@ -68,6 +67,7 @@ contract Karma {
         }
 
         // Store the karma implementation address
+        // solhint-disable-next-line avoid-low-level-calls
         assembly {
             sstore(KARMA_PROXY, newImplementation)
         }
@@ -151,6 +151,7 @@ contract Karma {
     /// @dev Gets the implementation address.
     /// @return implementation Implementation address.
     function getImplementation() external view returns (address implementation) {
+        // solhint-disable-next-line avoid-low-level-calls
         assembly {
             implementation := sload(KARMA_PROXY)
         }

contracts/MechFactoryBasic.sol

@@ -11,13 +11,13 @@ contract MechFactoryBasic {
     string public constant VERSION = "0.1.0";
 
     /// @dev Registers service as a mech.
-    /// @param mechManager Mech manager address.
+    /// @param mechMarketplace Mech marketplace address.
     /// @param serviceRegistry Service registry address.
     /// @param serviceId Service id.
     /// @param payload Mech creation payload.
     /// @return mech The created mech instance address.
     function createMech(
-        address mechManager,
+        address mechMarketplace,
         address serviceRegistry,
         uint256 serviceId,
         bytes memory payload
@@ -34,7 +34,7 @@ contract MechFactoryBasic {
         bytes32 salt = keccak256(abi.encode(block.timestamp, msg.sender, serviceId));
 
         // Service multisig is isOperator() for the mech
-        mech = address((new AgentMech){salt: salt}(mechManager, serviceRegistry, serviceId, price));
+        mech = address((new AgentMech){salt: salt}(mechMarketplace, serviceRegistry, serviceId, price));
 
         emit CreateBasicMech(mech, serviceId, price);
     }