Script and proxy changes

.gitignore

@@ -33,3 +33,5 @@ testScript.sh
 CLAUDE.md
 
 .idea/
+
+hardhat-scripts/loadTest/*

Errors.md

@@ -173,3 +173,6 @@
 | `InvalidData()`                               | `0x5cb045db` |
 | `InvalidSignature()`                          | `0x8baa579f` |
 | `DeadlinePassed()`                            | `0x70f65caa` |
+| `OnlyRequestHandlerAllowed()`                 | `0x5c1aa683` |
+| `OnlyPromiseResolverAllowed()`                | `0x2392c25e` |
+| `InvalidReceiver()`                           | `0x1e4ec46b` |

FunctionSignatures.md

@@ -16,9 +16,9 @@
 | `consumeFrom`                | `0x40dd78be` |
 | `creationCodeWithArgs`       | `0xc126dcc4` |
 | `deployForwarder__`          | `0xd4e3b034` |
-| `endAuction`                 | `0x1212e653` |
+| `endAuction`                 | `0x7426f0f6` |
 | `evmxSlug`                   | `0x8bae77c2` |
-| `expireBid`                  | `0x1dd5022c` |
+| `expireBid`                  | `0x33b5b234` |
 | `feesManager__`              | `0x70568b58` |
 | `forwarderAddresses`         | `0x5390fdcb` |
 | `getOnChainAddress`          | `0xb6abffd7` |
@@ -113,62 +113,62 @@
 
 ## FeesManager
 
-| Function                         | Signature    |
-| -------------------------------- | ------------ |
-| `addressResolver__`              | `0x6a750469` |
-| `approveAppGateway`              | `0xa3b53d8b` |
-| `approveAppGatewayWithSignature` | `0x94b649ec` |
-| `approveAppGateways`             | `0x86d23ab2` |
-| `asyncDeployer__`                | `0x2a39e801` |
-| `auctionManager`                 | `0xb0192f9a` |
-| `blockCredits`                   | `0x9e434307` |
-| `cancelOwnershipHandover`        | `0x54d1f13d` |
-| `completeOwnershipHandover`      | `0xf04e283e` |
-| `consumeFrom`                    | `0x40dd78be` |
-| `creationCodeWithArgs`           | `0xc126dcc4` |
-| `deployForwarder__`              | `0xd4e3b034` |
-| `deposit`                        | `0x5671d329` |
-| `deprecatedSbType`               | `0x5a783900` |
-| `evmxSlug`                       | `0x8bae77c2` |
-| `feesManager__`                  | `0x70568b58` |
-| `feesPlugs`                      | `0x23f5ee8a` |
-| `feesPool`                       | `0x6b259690` |
-| `forwarderAddresses`             | `0x5390fdcb` |
-| `getAvailableCredits`            | `0xb065a8e5` |
-| `getOnChainAddress`              | `0xb6abffd7` |
-| `getOverrideParams`              | `0x54f0a866` |
-| `handleRevert`                   | `0x44792f25` |
-| `initialize`                     | `0xbf2c8539` |
-| `initializeOnChain`              | `0x86f01739` |
-| `isApproved`                     | `0xa389783e` |
-| `isAsyncModifierSet`             | `0xb69e0c4a` |
-| `isCreditSpendable`              | `0x4f8990fd` |
-| `isNonceUsed`                    | `0xcab7e8eb` |
-| `isValidPromise`                 | `0xb690b962` |
-| `maxFees`                        | `0xe83e34b1` |
-| `onCompleteData`                 | `0xb52fa926` |
-| `onDeployComplete`               | `0xfa3dbd1e` |
-| `overrideParams`                 | `0xec5490fe` |
-| `owner`                          | `0x8da5cb5b` |
-| `ownershipHandoverExpiresAt`     | `0xfee81cf4` |
-| `renounceOwnership`              | `0x715018a6` |
-| `requestBlockedCredits`          | `0xb62d25ac` |
-| `requestOwnershipHandover`       | `0x25692962` |
-| `rescueFunds`                    | `0x6ccae054` |
-| `sbType`                         | `0x745de344` |
-| `setAddress`                     | `0x85bf312c` |
-| `setFeesPlug`                    | `0xd6a9a8b7` |
-| `setFeesPool`                    | `0xd6684588` |
-| `tokenOnChainBalances`           | `0x3b27866d` |
-| `transferCredits`                | `0xf1686c89` |
-| `transferOwnership`              | `0xf2fde38b` |
-| `unblockAndAssignCredits`        | `0x01958181` |
-| `unblockCredits`                 | `0xa0b32314` |
-| `unwrap`                         | `0x7647691d` |
-| `userCredits`                    | `0x20babb92` |
-| `watcher__`                      | `0x300bb063` |
-| `withdrawCredits`                | `0xcfc6dbd9` |
-| `wrap`                           | `0x023276f0` |
+| Function                     | Signature    |
+| ---------------------------- | ------------ |
+| `addressResolver__`          | `0x6a750469` |
+| `approve`                    | `0xa3b53d8b` |
+| `approveWithSignature`       | `0x94b649ec` |
+| `approveAppGateways`         | `0x86d23ab2` |
+| `asyncDeployer__`            | `0x2a39e801` |
+| `auctionManager`             | `0xb0192f9a` |
+| `blockCredits`               | `0x9e434307` |
+| `cancelOwnershipHandover`    | `0x54d1f13d` |
+| `completeOwnershipHandover`  | `0xf04e283e` |
+| `consumeFrom`                | `0x40dd78be` |
+| `creationCodeWithArgs`       | `0xc126dcc4` |
+| `deployForwarder__`          | `0xd4e3b034` |
+| `deposit`                    | `0x5671d329` |
+| `deprecatedSbType`           | `0x5a783900` |
+| `evmxSlug`                   | `0x8bae77c2` |
+| `feesManager__`              | `0x70568b58` |
+| `feesPlugs`                  | `0x23f5ee8a` |
+| `feesPool`                   | `0x6b259690` |
+| `forwarderAddresses`         | `0x5390fdcb` |
+| `balanceOf`                  | `0xb065a8e5` |
+| `getOnChainAddress`          | `0xb6abffd7` |
+| `getOverrideParams`          | `0x54f0a866` |
+| `handleRevert`               | `0x44792f25` |
+| `initialize`                 | `0xbf2c8539` |
+| `initializeOnChain`          | `0x86f01739` |
+| `isApproved`                 | `0xa389783e` |
+| `isAsyncModifierSet`         | `0xb69e0c4a` |
+| `isCreditSpendable`          | `0x4f8990fd` |
+| `isNonceUsed`                | `0xcab7e8eb` |
+| `isValidPromise`             | `0xb690b962` |
+| `maxFees`                    | `0xe83e34b1` |
+| `onCompleteData`             | `0xb52fa926` |
+| `onDeployComplete`           | `0xfa3dbd1e` |
+| `overrideParams`             | `0xec5490fe` |
+| `owner`                      | `0x8da5cb5b` |
+| `ownershipHandoverExpiresAt` | `0xfee81cf4` |
+| `renounceOwnership`          | `0x715018a6` |
+| `requestBlockedCredits`      | `0xb62d25ac` |
+| `requestOwnershipHandover`   | `0x25692962` |
+| `rescueFunds`                | `0x6ccae054` |
+| `sbType`                     | `0x745de344` |
+| `setAddress`                 | `0x85bf312c` |
+| `setFeesPlug`                | `0xd6a9a8b7` |
+| `setFeesPool`                | `0xd6684588` |
+| `tokenOnChainBalances`       | `0x3b27866d` |
+| `transferFrom`               | `0xf1686c89` |
+| `transferOwnership`          | `0xf2fde38b` |
+| `unblockAndAssignCredits`    | `0x01958181` |
+| `unblockCredits`             | `0xa0b32314` |
+| `unwrap`                     | `0x7647691d` |
+| `userCredits`                | `0x20babb92` |
+| `watcher__`                  | `0x300bb063` |
+| `withdrawCredits`            | `0xcfc6dbd9` |
+| `wrap`                       | `0x023276f0` |
 
 ## FeesPool
 

contracts/evmx/AuctionManager.sol

@@ -5,14 +5,14 @@ import {ECDSA} from "solady/utils/ECDSA.sol";
 import "solady/utils/Initializable.sol";
 import "./interfaces/IPromise.sol";
 import "./interfaces/IAuctionManager.sol";
-
 import "../utils/AccessControl.sol";
 import "../utils/RescueFundsLib.sol";
 import {AuctionNotOpen, AuctionClosed, BidExceedsMaxFees, LowerBidAlreadyExists, InvalidTransmitter, MaxReAuctionCountReached, InvalidBid} from "../utils/common/Errors.sol";
 import {SCHEDULE} from "../utils/common/Constants.sol";
 
 import {TRANSMITTER_ROLE} from "../utils/common/AccessRoles.sol";
 import {AppGatewayBase} from "./base/AppGatewayBase.sol";
+import "./interfaces/IERC20.sol";
 
 /// @title AuctionManagerStorage
 /// @notice Storage for the AuctionManager contract
@@ -169,8 +169,10 @@ contract AuctionManager is AuctionManagerStorage, Initializable, AppGatewayBase,
     }
 
     /// @notice Ends an auction
-    /// @param requestCount_ The ID of the auction
-    function endAuction(uint40 requestCount_) external override onlyPromises {
+    /// @param data The encoded request count
+    function endAuction(bytes memory data, bytes memory) external onlyPromises {
+        uint40 requestCount_ = abi.decode(data, (uint40));
+        if (requestCount_ == 0) revert InvalidBid();
         if (
             auctionStatus[requestCount_] == AuctionStatus.CLOSED ||
             auctionStatus[requestCount_] == AuctionStatus.NOT_STARTED
@@ -207,26 +209,27 @@ contract AuctionManager is AuctionManagerStorage, Initializable, AppGatewayBase,
     /// @notice Expires a bid and restarts an auction in case a request is not fully executed.
     /// @dev Auction can be restarted only for `maxReAuctionCount` times.
     /// @dev It also unblocks the fees from last transmitter to be assigned to the new winner.
-    /// @param requestCount_ The request id
-    function expireBid(uint40 requestCount_) external override onlyPromises {
-        if (reAuctionCount[requestCount_] >= maxReAuctionCount) revert MaxReAuctionCountReached();
-        RequestParams memory requestParams = watcher__().getRequestParams(requestCount_);
+    /// @param data The encoded request count
+    function expireBid(bytes memory data, bytes memory) external override onlyPromises {
+        uint40 requestCount = abi.decode(data, (uint40));
+        if (reAuctionCount[requestCount] >= maxReAuctionCount) revert MaxReAuctionCountReached();
+        RequestParams memory requestParams = watcher__().getRequestParams(requestCount);
 
         // if executed or cancelled, bid is not expired
         if (
             requestParams.requestTrackingParams.payloadsRemaining == 0 ||
             requestParams.requestTrackingParams.isRequestCancelled
         ) return;
 
-        delete winningBids[requestCount_];
-        auctionStatus[requestCount_] = AuctionStatus.RESTARTED;
-        reAuctionCount[requestCount_]++;
+        delete winningBids[requestCount];
+        auctionStatus[requestCount] = AuctionStatus.RESTARTED;
+        reAuctionCount[requestCount]++;
 
         watcher__().requestHandler__().assignTransmitter(
-            requestCount_,
+            requestCount,
             Bid({fee: 0, transmitter: address(0), extraData: ""})
         );
-        emit AuctionRestarted(requestCount_);
+        emit AuctionRestarted(requestCount);
     }
 
     function _createRequest(
@@ -260,7 +263,7 @@ contract AuctionManager is AuctionManagerStorage, Initializable, AppGatewayBase,
         uint256 delayInSeconds_
     ) internal returns (uint256 watcherFees) {
         watcherFees = watcher__().getPrecompileFees(SCHEDULE, abi.encode(delayInSeconds_));
-        feesManager__().transferCredits(from_, to_, watcherFees);
+        IERC20(address(feesManager__())).transferFrom(from_, to_, watcherFees);
     }
 
     /// @notice Recovers the signer of a message

contracts/evmx/base/AppGatewayBase.sol

@@ -228,7 +228,7 @@ abstract contract AppGatewayBase is AddressResolverUtil, IAppGateway {
 
     function _approveFeesWithSignature(bytes memory feesApprovalData_) internal {
         if (feesApprovalData_.length == 0) return;
-        (consumeFrom, , ) = feesManager__().approveAppGatewayWithSignature(feesApprovalData_);
+        (consumeFrom, , ) = feesManager__().approveWithSignature(feesApprovalData_);
     }
 
     /// @notice Withdraws fee tokens
@@ -242,7 +242,7 @@ abstract contract AppGatewayBase is AddressResolverUtil, IAppGateway {
         uint256 amount_,
         address receiver_
     ) internal {
-        feesManager__().approveAppGateway(address(feesManager__()), true);
+        feesManager__().approve(address(feesManager__()), true);
         feesManager__().withdrawCredits(chainSlug_, token_, amount_, maxFees, receiver_);
     }