test: updating tests

contracts/BalanceTrackerFixedPriceToken.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.28;
 
 import {BalanceTrackerFixedPriceBase, ZeroAddress, NoDepositAllowed, TransferFailed} from "./BalanceTrackerFixedPriceBase.sol";
 import {IMech} from "./interfaces/IMech.sol";
 
 interface IToken {
     /// @dev Transfers the token amount.
@@ -24,9 +24,9 @@
     function balanceOf(address account) external view returns (uint256);
 }
 
-contract BalanceTrackerFixedPriceNative is BalanceTrackerFixedPriceBase {
+contract BalanceTrackerFixedPriceToken is BalanceTrackerFixedPriceBase {
     // OLAS token address
     address public immutable olas;
 
     /// @dev BalanceTrackerFixedPrice constructor.
     /// @param _mechMarketplace Mech marketplace address.

contracts/MechFactoryFixedPriceNative.sol

@@ -22,17 +22,24 @@ contract MechFactoryFixedPriceNative {
 
     // Agent factory version number
     string public constant VERSION = "0.1.0";
+    // Mech marketplace address
+    address public immutable mechMarketplace;
+
     // Nonce
     uint256 internal _nonce;
 
+    /// @dev MechFactoryFixedPriceNative constructor.
+    /// @param _mechMarketplace Mech marketplace address.
+    constructor(address _mechMarketplace) {
+        mechMarketplace = _mechMarketplace;
+    }
+
     /// @dev Registers service as a mech.
-    /// @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 mechMarketplace,
         address serviceRegistry,
         uint256 serviceId,
         bytes memory payload

contracts/MechFactoryFixedPriceToken.sol

@@ -17,22 +17,29 @@ error MarketplaceOnly(address sender, address marketplace);
 error ZeroAddress();
 
 /// @title Mech Factory Basic - Periphery smart contract for managing basic mech creation
-contract MechFactoryFixedPriceNative {
+contract MechFactoryFixedPriceToken {
     event CreateFixedPriceMech(address indexed mech, uint256 indexed serviceId, uint256 maxDeliveryRate);
 
     // Agent factory version number
     string public constant VERSION = "0.1.0";
+    // Mech marketplace address
+    address public immutable mechMarketplace;
+
     // Nonce
     uint256 internal _nonce;
 
+    /// @dev MechFactoryFixedPriceNative constructor.
+    /// @param _mechMarketplace Mech marketplace address.
+    constructor(address _mechMarketplace) {
+        mechMarketplace = _mechMarketplace;
+    }
+
     /// @dev Registers service as a mech.
-    /// @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 mechMarketplace,
         address serviceRegistry,
         uint256 serviceId,
         bytes memory payload

contracts/MechMarketplace.sol

@@ -9,12 +9,11 @@ import {IServiceRegistry} from "./interfaces/IServiceRegistry.sol";
 
 interface IMechFactory {
     /// @dev Registers service as a mech.
-    /// @param mechManager Mech manager 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 serviceRegistry, uint256 serviceId, bytes memory payload)
+    function createMech(address serviceRegistry, uint256 serviceId, bytes memory payload)
         external returns (address mech);
 }
 
@@ -114,10 +113,7 @@ contract MechMarketplace is IErrorsMarketplace {
     /// @dev MechMarketplace constructor.
     /// @param _serviceRegistry Service registry contract address.
     /// @param _karma Karma proxy contract address.
-    constructor(
-        address _serviceRegistry,
-        address _karma
-    ) {
+    constructor(address _serviceRegistry, address _karma) {
         // Check for zero address
         if (_serviceRegistry == address(0) || _karma == address(0)) {
             revert ZeroAddress();
@@ -262,7 +258,7 @@ contract MechMarketplace is IErrorsMarketplace {
             revert UnauthorizedAccount(mechFactory);
         }
 
-        mech = IMechFactory(mechFactory).createMech(address(this), serviceRegistry, serviceId, payload);
+        mech = IMechFactory(mechFactory).createMech(serviceRegistry, serviceId, payload);
 
         // This should never be the case
         if (mech == address(0)) {
@@ -333,7 +329,7 @@ contract MechMarketplace is IErrorsMarketplace {
     /// @notice The request is going to be registered for a specified priority mech.
     /// @param data Self-descriptive opaque data-blob.
     /// @param priorityMechServiceId Priority mech service Id.
-    /// @param requesterServiceId Requester service Id (optional).
+    /// @param requesterServiceId Requester service Id, or zero if EOA.
     /// @param responseTimeout Relative response time in sec.
     /// @param paymentData Additional payment-related request data (optional).
     /// @return requestId Request Id.
@@ -542,7 +538,7 @@ contract MechMarketplace is IErrorsMarketplace {
         uint256 mechServiceId = IMech(mech).tokenId();
 
         // Check mech validity as it must be created and recorded via this marketplace
-        if (mapServiceIdMech[mechServiceId] == mech) {
+        if (mapServiceIdMech[mechServiceId] != mech) {
             revert UnauthorizedAccount(mech);
         }
 

contracts/OlasMech.sol

@@ -53,9 +53,12 @@ abstract contract OlasMech is Mech, IErrorsMech, ImmutableStorage {
     // Map of request Id => sender address
     mapping(uint256 => address) public mapRequestAddresses;
 
+    /// @dev OlasMech constructor.
     /// @param _mechMarketplace Mech marketplace address.
     /// @param _serviceRegistry Address of the registry contract.
     /// @param _serviceId Service Id.
+    /// @param _maxDeliveryRate Mech max delivery rate.
+    /// @param _paymentType Mech payment type.
     constructor(
         address _mechMarketplace,
         address _serviceRegistry,
@@ -64,7 +67,7 @@ abstract contract OlasMech is Mech, IErrorsMech, ImmutableStorage {
         bytes32 _paymentType
     ) {
         // Check for zero address
-        if (mechMarketplace == address(0)) {
+        if (_mechMarketplace == address(0)) {
             revert ZeroAddress();
         }
 
@@ -197,18 +200,14 @@ abstract contract OlasMech is Mech, IErrorsMech, ImmutableStorage {
         address account = mapRequestAddresses[requestId];
 
         // Get the mech delivery info from the mech marketplace
-        IMechMarketplace.MechDelivery memory mechDelivery = IMechMarketplace(mechMarketplace).getMechDeliveryInfo(requestId);
+        IMechMarketplace.MechDelivery memory mechDelivery =
+            IMechMarketplace(mechMarketplace).mapRequestIdDeliveries(requestId);
 
         // Instantly return if the request has been delivered
         if (mechDelivery.deliveryMech != address(0)) {
             return requestData;
         }
 
-        // Check for max delivery rate compared to requested one
-        if (maxDeliveryRate > mechDelivery.deliveryRate) {
-            revert Overflow(maxDeliveryRate, mechDelivery.deliveryRate);
-        }
-
         // The account is zero if the delivery mech is different from a priority mech, or if request does not exist
         if (account == address(0)) {
             account = mechDelivery.requester;
@@ -222,6 +221,11 @@ abstract contract OlasMech is Mech, IErrorsMech, ImmutableStorage {
             _cleanRequestInfo(account, requestId);
         }
 
+        // Check for max delivery rate compared to requested one
+        if (maxDeliveryRate > mechDelivery.deliveryRate) {
+            revert Overflow(maxDeliveryRate, mechDelivery.deliveryRate);
+        }
+
         // Perform a pre-delivery of the data if it needs additional parsing
         requestData = _preDeliver(account, requestId, data);
 
@@ -298,7 +302,7 @@ abstract contract OlasMech is Mech, IErrorsMech, ImmutableStorage {
 
         // Mech marketplace delivery finalization if the request was not delivered already
         if (requestData.length > 0) {
-            IMechMarketplace(mechMarketplace).deliverMarketplace(requestId, requestData, tokenId());
+            IMechMarketplace(mechMarketplace).deliverMarketplace(requestId, requestData);
         }
 
         _locked = 1;
@@ -331,6 +335,7 @@ abstract contract OlasMech is Mech, IErrorsMech, ImmutableStorage {
         if (state != IServiceRegistry.ServiceState.Deployed) {
             revert WrongServiceState(uint256(state), serviceId);
         }
+
         return multisig == signer;
     }
 

contracts/integrations/nevermined/MechFactoryNvmSubscription.sol

@@ -22,17 +22,24 @@ contract MechFactoryNvmSubscription {
 
     // Agent factory version number
     string public constant VERSION = "0.1.0";
+    // Mech marketplace address
+    address public immutable mechMarketplace;
+
     // Nonce
     uint256 internal _nonce;
 
+    /// @dev MechFactoryFixedPriceNative constructor.
+    /// @param _mechMarketplace Mech marketplace address.
+    constructor(address _mechMarketplace) {
+        mechMarketplace = _mechMarketplace;
+    }
+
     /// @dev Registers service as a mech.
-    /// @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 mechMarketplace,
         address serviceRegistry,
         uint256 serviceId,
         bytes memory payload

contracts/interfaces/IMechMarketplace.sol

@@ -20,15 +20,13 @@ interface IMechMarketplace {
     /// @dev Delivers a request.
     /// @param requestId Request id.
     /// @param requestData Self-descriptive opaque data-blob.
-    /// @param deliveryMechServiceId Mech operator service Id.
     function deliverMarketplace(
         uint256 requestId,
-        bytes memory requestData,
-        uint256 deliveryMechServiceId
+        bytes memory requestData
     ) external;
 
     /// @dev Gets mech delivery info.
     /// @param requestId Request Id.
     /// @return Mech delivery info.
-    function getMechDeliveryInfo(uint256 requestId) external returns (MechDelivery memory);
+    function mapRequestIdDeliveries(uint256 requestId) external returns (MechDelivery memory);
 }