Surge gameplay iteration stage

.gitignore

@@ -13,6 +13,7 @@ src/types
 typechain-types/
 
 .env
+.env.*
 .DS_Store
 
 .gas-snapshot/

Errors.md

@@ -16,6 +16,13 @@
 | `PromiseRevertFailed()`    | `0x0175b9de` |
 | `NotLatestPromise()`       | `0x39ca95d3` |
 
+## evmx/helpers/ForwarderSolana.sol
+
+| Error                      | Signature    |
+| -------------------------- | ------------ |
+| `InvalidSolanaChainSlug()` | `0xe37803ab` |
+| `AddressResolverNotSet()`  | `0x6d55276d` |
+
 ## evmx/plugs/ContractFactoryPlug.sol
 
 | Error                            | Signature    |

contracts/evmx/fees/FeesManager.sol

@@ -2,6 +2,7 @@
 pragma solidity ^0.8.21;
 
 import "./Credit.sol";
+import {ForwarderSolana} from "../helpers/ForwarderSolana.sol";
 
 /// @title FeesManager
 /// @notice Contract for managing fees
@@ -53,17 +54,20 @@ contract FeesManager is Credit {
         address feesPool_,
         address owner_,
         uint256 fees_,
-        bytes32 sbType_
+        bytes32 sbType_,
+        address forwarderSolana_
     ) public reinitializer(2) {
         evmxSlug = evmxSlug_;
         sbType = sbType_;
         feesPool = IFeesPool(feesPool_);
-        susdcToken = _createContractId("susdc token");
+        susdcContractId = _createContractId("susdc token");
         maxFeesPerChainSlug[evmxSlug_] = fees_;
         _setMaxFees(fees_);
 
         _initializeOwner(owner_);
         _initializeAppGateway(addressResolver_);
+
+        forwarderSolana = ForwarderSolana(forwarderSolana_);
     }
 
     function setChainMaxFees(
@@ -94,56 +98,71 @@ contract FeesManager is Credit {
 
     /////////////////////// FEES MANAGEMENT ///////////////////////
 
-    /// @notice Blocks fees for a request count
+    /// @notice Blocks fees for a request count - called when bidding starts (auction is started)
     /// @param requestCount_ The batch identifier
-    /// @param consumeFrom_ The fees payer address
+    /// @param creditHolder_ The credit holder address (evmx address)
     /// @param credits_ The total fees to block
     /// @dev Only callable by delivery helper
     function blockCredits(
         uint40 requestCount_,
-        address consumeFrom_,
+        address creditHolder_,
         uint256 credits_
     ) external override onlyRequestHandler {
-        if (balanceOf(consumeFrom_) < credits_) revert InsufficientCreditsAvailable();
+        if (balanceOf(creditHolder_) < credits_) revert InsufficientCreditsAvailable();
 
-        userBlockedCredits[consumeFrom_] += credits_;
+        blockedCredits[creditHolder_] += credits_;
         requestBlockedCredits[requestCount_] = credits_;
-        emit CreditsBlocked(requestCount_, consumeFrom_, credits_);
+        emit CreditsBlocked(requestCount_, creditHolder_, credits_);
     }
 
-    /// @notice Unblocks fees after successful execution and assigns them to the transmitter
+    /// @notice Unblocks fees after successful execution and assigns them to the transmitter - this is called when request execution by transmitter is done.
+    ///         Then we assign used credits to the transmitter (credits come from user and transmitter is making a call in his name) and unused credits are returned to the user.
     /// @param requestCount_ The request count of the executed batch
     /// @param assignTo_ The address of the transmitter
     function unblockAndAssignCredits(
         uint40 requestCount_,
         address assignTo_
     ) external override onlyRequestHandler {
-        uint256 blockedCredits = requestBlockedCredits[requestCount_];
-        if (blockedCredits == 0) return;
+        uint256 blockedCreditsAmount = requestBlockedCredits[requestCount_];
+        if (blockedCreditsAmount == 0) return;
 
         address consumeFrom = _getRequestParams(requestCount_).requestFeesDetails.consumeFrom;
 
         // Unblock credits from the original user
-        userBlockedCredits[consumeFrom] -= blockedCredits;
+        blockedCredits[consumeFrom] -= blockedCreditsAmount;
 
         // Burn tokens from the original user
-        _burn(consumeFrom, blockedCredits);
+        _burn(consumeFrom, blockedCreditsAmount);
 
         // Mint tokens to the transmitter
-        _mint(assignTo_, blockedCredits);
+        _mint(assignTo_, blockedCreditsAmount);
 
         // Clean up storage
         delete requestBlockedCredits[requestCount_];
-        emit CreditsUnblockedAndAssigned(requestCount_, consumeFrom, assignTo_, blockedCredits);
+        emit CreditsUnblockedAndAssigned(
+            requestCount_,
+            consumeFrom,
+            assignTo_,
+            blockedCreditsAmount
+        );
+    }
+
+    function setFeesPlugSolanaProgramId(bytes32 feesPlugSolanaProgramId_) external onlyOwner {
+        feesPlugSolanaProgramId = feesPlugSolanaProgramId_;
+    }
+
+    function setSusdcSolanaProgramId(bytes32 susdcSolanaProgramId_) external onlyOwner {
+        susdcSolanaProgramId = susdcSolanaProgramId_;
     }
 
+    /// @notice If there was an auction but no transmitter wanted to bid (auction was not finished), we unblock the credits and return them to the user
     function unblockCredits(uint40 requestCount_) external override onlyRequestHandler {
-        uint256 blockedCredits = requestBlockedCredits[requestCount_];
-        if (blockedCredits == 0) return;
+        uint256 blockedCreditsAmount = requestBlockedCredits[requestCount_];
+        if (blockedCreditsAmount == 0) return;
 
         // Unblock credits from the original user
         address consumeFrom = _getRequestParams(requestCount_).requestFeesDetails.consumeFrom;
-        userBlockedCredits[consumeFrom] -= blockedCredits;
+        blockedCredits[consumeFrom] -= blockedCreditsAmount;
 
         delete requestBlockedCredits[requestCount_];
         emit CreditsUnblocked(requestCount_, consumeFrom);

contracts/evmx/helpers/ForwarderSolana.sol

@@ -56,8 +56,11 @@ contract ForwarderSolana is ForwarderStorage, Initializable, AddressResolverUtil
 
     /// @notice Fallback function to process the contract calls to onChainAddress
     /// @dev It queues the calls in the middleware and deploys the promise contract
-    // function callSolana(SolanaInstruction memory solanaInstruction, bytes32 switchboardSolana) external {
-    function callSolana(bytes memory solanaPayload, bytes32 target) external {
+    function callSolana(
+        bytes memory solanaPayload,
+        bytes32 target,
+        address callerAppGateway
+    ) external {
         if (address(addressResolver__) == address(0)) {
             revert AddressResolverNotSet();
         }
@@ -66,18 +69,15 @@ contract ForwarderSolana is ForwarderStorage, Initializable, AddressResolverUtil
         }
 
         // validates if the async modifier is set
-        address msgSender = msg.sender;
+        // address msgSender = msg.sender;
+        address msgSender = callerAppGateway;
         bool isAsyncModifierSet = IAppGateway(msgSender).isAsyncModifierSet();
         if (!isAsyncModifierSet) revert AsyncModifierNotSet();
 
         // fetch the override params from app gateway
         (OverrideParams memory overrideParams, bytes32 sbType) = IAppGateway(msgSender)
             .getOverrideParams();
 
-        // TODO:GW: after POC make it work like below
-        // get the switchboard address from the watcher precompile config
-        // address switchboard = watcherPrecompileConfig().switchboards(chainSlug, sbType);
-
         // Queue the call in the middleware.
         QueueParams memory queueParams;
         queueParams.overrideParams = overrideParams;