Merge pull request #134 from SocketDotTech/new-contract-structure

Contract Structure

Author: arthcp

contracts/evmx/payload-delivery/app-gateway/DeliveryHelper.sol renamed to contracts/app-gateway/DeliveryHelper.sol

@@ -6,23 +6,6 @@ import "./FeesHelpers.sol";
 /// @title DeliveryHelper
 /// @notice Contract for managing payload delivery
 contract DeliveryHelper is FeesHelpers {
-    constructor() {
-        _disableInitializers(); // disable for implementation
-    }
-
-    /// @notice Initializer function to replace constructor
-    /// @param addressResolver_ The address resolver contract
-    /// @param owner_ The owner address
-    function initialize(
-        address addressResolver_,
-        address owner_,
-        uint128 bidTimeout_
-    ) public reinitializer(1) {
-        _setAddressResolver(addressResolver_);
-        _initializeOwner(owner_);
-
-        bidTimeout = bidTimeout_;
-    }
 
     /// @notice Calls the watcher precompile to start processing a request
     /// @dev If a transmitter was already assigned, it updates the transmitter in watcher precompile too
@@ -104,12 +87,4 @@ contract DeliveryHelper is FeesHelpers {
         }
     }
 
-    /// @notice Returns the request metadata
-    /// @param requestCount_ The ID of the request
-    /// @return requestMetadata The request metadata
-    function getRequestMetadata(
-        uint40 requestCount_
-    ) external view returns (RequestMetadata memory) {
-        return requests[requestCount_];
-    }
 }

contracts/evmx/payload-delivery/app-gateway/RequestQueue.sol renamed to contracts/app-gateway/RequestQueue.sol

@@ -8,17 +8,7 @@ abstract contract RequestQueue is DeliveryUtils {
     // slots [207-257] reserved for gap
     uint256[50] _gap_queue_async;
 
-    /// @notice Clears the call parameters array
-    function clearQueue() public {
-        delete queuePayloadParams;
-    }
-
-    /// @notice Queues a new payload
-    /// @param queuePayloadParams_ The call parameters
-    function queue(QueuePayloadParams memory queuePayloadParams_) external {
-        queuePayloadParams.push(queuePayloadParams_);
-    }
-
+   
     /// @notice Initiates a batch of payloads
     /// @param maxFees_ The fees data
     /// @param auctionManager_ The auction manager address
@@ -69,7 +59,6 @@ abstract contract RequestQueue is DeliveryUtils {
         params.finalizeCount = finalizeCount;
 
         _checkBatch(consumeFrom_, params.appGateway, params.maxFees);
-
         return _submitBatchRequest(payloadSubmitParamsArray, consumeFrom_, params);
     }
 
@@ -209,7 +198,6 @@ abstract contract RequestQueue is DeliveryUtils {
             (payload, target) = _createDeployPayloadDetails(queuePayloadParams_);
         }
 
-        if (payload.length > PAYLOAD_SIZE_LIMIT) revert PayloadTooLarge();
         if (queuePayloadParams_.value > chainMaxMsgValueLimit[queuePayloadParams_.chainSlug])
             revert MaxMsgValueLimitExceeded();
 

contracts/evmx/watcherPrecompile/core/RequestHandler.sol renamed to contracts/core/RequestHandler.sol

@@ -135,7 +135,6 @@ abstract contract RequestHandler is WatcherPrecompileCore {
     /// @dev It verifies that the caller is the middleware and that the request hasn't been started yet
     function startProcessingRequest(uint40 requestCount, address transmitter_) public {
         RequestParams storage r = requestParams[requestCount];
-        if (r.middleware != msg.sender) revert InvalidCaller();
         if (r.transmitter != address(0)) revert AlreadyStarted();
         if (r.currentBatchPayloadsLeft > 0) revert AlreadyStarted();
 
@@ -171,10 +170,5 @@ abstract contract RequestHandler is WatcherPrecompileCore {
         r.currentBatchPayloadsLeft = totalPayloads;
     }
 
-    /// @notice Gets the current request count
-    /// @return The current request count
-    /// @dev This function returns the next request count, which is the current request count
-    function getCurrentRequestCount() external view returns (uint40) {
-        return nextRequestCount;
-    }
+   
 }

contracts/evmx/watcherPrecompile/core/WatcherPrecompileCore.sol renamed to contracts/core/WatcherPrecompileCore.sol

@@ -115,7 +115,6 @@ abstract contract WatcherPrecompileCore is
         payloads[params_.payloadId].prevDigestsHash = _getPreviousDigestsHash(
             params_.payloadHeader.getBatchCount()
         );
-        emit QueryRequested(params_);
     }
 
     // ================== Helper functions ==================
@@ -185,37 +184,7 @@ abstract contract WatcherPrecompileCore is
         return payloadParamsArray;
     }
 
-    /// @notice Encodes an ID for a timeout or payload
-    /// @return The encoded ID
-    /// @dev This function creates a unique ID by combining the chain slug, address, and a counter
-    function _encodeTimeoutId() internal returns (bytes32) {
-        // Encode timeout ID by bit-shifting and combining:
-        // EVMx chainSlug (32 bits) | watcher precompile address (160 bits) | counter (64 bits)
-        return bytes32(timeoutIdPrefix | payloadCounter++);
-    }
-
-    /// @notice Verifies that a watcher signature is valid
-    /// @param inputData_ The input data to verify
-    /// @param signatureNonce_ The nonce of the signature
-    /// @param signature_ The signature to verify
-    /// @dev This function verifies that the signature was created by the watcher and that the nonce has not been used before
-    function _isWatcherSignatureValid(
-        bytes memory inputData_,
-        uint256 signatureNonce_,
-        bytes memory signature_
-    ) internal {
-        if (isNonceUsed[signatureNonce_]) revert NonceUsed();
-        isNonceUsed[signatureNonce_] = true;
-
-        bytes32 digest = keccak256(
-            abi.encode(address(this), evmxSlug, signatureNonce_, inputData_)
-        );
-        digest = keccak256(abi.encodePacked("\x19Ethereum Signed Message:\n32", digest));
-
-        // recovered signer is checked for the valid roles later
-        address signer = ECDSA.recover(digest, signature_);
-        if (signer != owner()) revert InvalidWatcherSignature();
-    }
+   
 
     function _consumeCallbackFeesFromRequestCount(uint256 fees_, uint40 requestCount_) internal {
         // for callbacks in all precompiles
@@ -233,24 +202,4 @@ abstract contract WatcherPrecompileCore is
         );
     }
 
-    /// @notice Gets the batch IDs for a request
-    /// @param requestCount_ The request count to get the batch IDs for
-    /// @return An array of batch IDs for the given request
-    function getBatches(uint40 requestCount_) external view returns (uint40[] memory) {
-        return requestBatchIds[requestCount_];
-    }
-
-    /// @notice Gets the payload IDs for a batch
-    /// @param batchCount_ The batch count to get the payload IDs for
-    /// @return An array of payload IDs for the given batch
-    function getBatchPayloadIds(uint40 batchCount_) external view returns (bytes32[] memory) {
-        return batchPayloadIds[batchCount_];
-    }
-
-    /// @notice Gets the payload parameters for a payload ID
-    /// @param payloadId_ The payload ID to get the parameters for
-    /// @return The payload parameters for the given payload ID
-    function getPayloadParams(bytes32 payloadId_) external view returns (PayloadParams memory) {
-        return payloads[payloadId_];
-    }
 }

contracts/evmx/AddressResolverUtil.sol

@@ -4,12 +4,10 @@ pragma solidity ^0.8.21;
 import {ECDSA} from "solady/utils/ECDSA.sol";
 import "solady/utils/Initializable.sol";
 import "../interfaces/IAuctionManager.sol";
-import {IMiddleware} from "../interfaces/IMiddleware.sol";
-import {IFeesManager} from "../interfaces/IFeesManager.sol";
 import "../../utils/AccessControl.sol";
-import {AddressResolverUtil} from "../AddressResolverUtil.sol";
 import {AuctionClosed, AuctionAlreadyStarted, BidExceedsMaxFees, LowerBidAlreadyExists, InvalidTransmitter} from "../../utils/common/Errors.sol";
 import {TRANSMITTER_ROLE} from "../../utils/common/AccessRoles.sol";
+import {AppGatewayBase} from "../base/AppGatewayBase.sol";
 
 /// @title AuctionManagerStorage
 /// @notice Storage for the AuctionManager contract
@@ -20,6 +18,10 @@ abstract contract AuctionManagerStorage is IAuctionManager {
     // slot 50
     uint32 public evmxSlug;
 
+    // slot 50
+    /// @notice The timeout after which a bid expires
+    uint128 public bidTimeout;
+
     // slot 51
     uint256 public maxReAuctionCount;
 
@@ -48,12 +50,7 @@ abstract contract AuctionManagerStorage is IAuctionManager {
 
 /// @title AuctionManager
 /// @notice Contract for managing auctions and placing bids
-contract AuctionManager is
-    AuctionManagerStorage,
-    Initializable,
-    AccessControl,
-    AddressResolverUtil
-{
+contract AuctionManager is AuctionManagerStorage, Initializable, AccessControl, AppGatewayBase {
     event AuctionRestarted(uint40 requestCount);
     event AuctionStarted(uint40 requestCount);
     event AuctionEnded(uint40 requestCount, Bid winningBid);
@@ -132,6 +129,7 @@ contract AuctionManager is
         // end the auction if the no auction end delay
         if (auctionEndDelaySeconds > 0) {
             _startAuction(requestCount_);
+            // queue and create request
             watcherPrecompile__().setTimeout(
                 auctionEndDelaySeconds,
                 abi.encodeWithSelector(this.endAuction.selector, requestCount_)
@@ -150,11 +148,8 @@ contract AuctionManager is
         if (requestMetadata.auctionManager != address(this)) revert InvalidBid();
 
         // get the total fees required for the watcher precompile ops
-        uint256 watcherFees = watcherPrecompileLimits().getTotalFeesRequired(
-            requestMetadata.queryCount,
-            requestMetadata.finalizeCount,
-            0,
-            0
+        uint256 watcherFees = watcherPrecompile().getMaxFees(
+            requestCount_
         );
         return requestMetadata.maxFees - watcherFees;
     }
@@ -173,25 +168,35 @@ contract AuctionManager is
 
         auctionClosed[requestCount_] = true;
         RequestMetadata memory requestMetadata = _getRequestMetadata(requestCount_);
+        
         // block the fees
-        IFeesManager(addressResolver__.feesManager()).blockCredits(
-            requestMetadata.consumeFrom,
-            winningBid.fee,
-            requestCount_
-        );
+        // in startRequestProcessing, block the fees from bid
+        // IFeesManager(addressResolver__.feesManager()).blockCredits(
+        //     requestMetadata.consumeFrom,
+        //     winningBid.fee,
+        //     requestCount_
+        // );
 
         // set the timeout for the bid expiration
         // useful in case a transmitter did bid but did not execute payloads
-        watcherPrecompile__().setTimeout(
-            IMiddleware(addressResolver__.deliveryHelper()).bidTimeout(),
-            abi.encodeWithSelector(this.expireBid.selector, requestCount_)
-        );
+        // todo: queue and submit timeouts
+        // watcherPrecompile__().timeout(
+        //     address(this),
+        //     abi.encodeWithSelector(this.expireBid.selector, requestCount_)
+        // );
 
         // start the request processing, it will finalize the request
-        IMiddleware(addressResolver__.deliveryHelper()).startRequestProcessing(
-            requestCount_,
-            winningBid
-        );
+        if(requestMetadata.transmitter != address(0)) {
+            IWatcherPrecompile(addressResolver__.watcherPrecompile()).updateTransmitter(
+                requestCount_,
+                winningBid
+            );
+        } else 
+            IWatcherPrecompile(addressResolver__.watcherPrecompile()).startRequestProcessing(
+                requestCount_,
+                winningBid
+            );
+        }
 
         emit AuctionEnded(requestCount_, winningBid);
     }
@@ -210,7 +215,8 @@ contract AuctionManager is
         auctionClosed[requestCount_] = false;
         reAuctionCount[requestCount_]++;
 
-        IFeesManager(addressResolver__.feesManager()).unblockCredits(requestCount_);
+        // todo: unblock credits by calling watcher for updating transmitter to addr(0)
+        // IFeesManager(addressResolver__.feesManager()).unblockCredits(requestCount_);
         emit AuctionRestarted(requestCount_);
     }