pass stagingReturnData to protocol allocatingCall

FastLane-Labs · Aug 16, 2023 · f7d2de8 · f7d2de8
1 parent ef251c2
commit f7d2de8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/src/contracts/atlas/Atlas.sol b/src/contracts/atlas/Atlas.sol
@@ -173,7 +173,7 @@ contract Atlas is Test, Factory {
         if (_executeSearcherCall(searcherCall, stagingReturnData, auctionAlreadyWon, environment)) {
             if (!auctionAlreadyWon) {
                 auctionAlreadyWon = true;
-                _executePayments(protocolCall, searcherCall.bids, environment);
+                _executePayments(protocolCall, searcherCall.bids, stagingReturnData, environment);
             }
         }
         return auctionAlreadyWon;

diff --git a/src/contracts/atlas/Escrow.sol b/src/contracts/atlas/Escrow.sol
@@ -177,10 +177,11 @@ contract Escrow is ProtocolVerifier, SafetyLocks, SearcherWrapper {
     function _executePayments(
         ProtocolCall calldata protocolCall,
         BidData[] calldata winningBids,
+        bytes memory stagingReturnData,
         address environment
     ) internal paymentsLock(environment) {
         // process protocol payments
-        try IExecutionEnvironment(environment).allocateRewards(winningBids) {}
+        try IExecutionEnvironment(environment).allocateRewards(winningBids, stagingReturnData) {}
         catch {
             emit MEVPaymentFailure(protocolCall.to, protocolCall.callConfig, winningBids);
         }

diff --git a/src/contracts/atlas/ExecutionEnvironment.sol b/src/contracts/atlas/ExecutionEnvironment.sol
@@ -278,7 +278,7 @@ contract ExecutionEnvironment is Test {
         require(atlas.balance >= escrowBalance, SEARCHER_MSG_VALUE_UNPAID);
     }
 
-    function allocateRewards(BidData[] calldata bids) external {
+    function allocateRewards(BidData[] calldata bids, bytes memory stagingReturnData) external {
         // msg.sender = escrow
         // address(this) = ExecutionEnvironment
         require(msg.sender == atlas, "ERR-04 InvalidCaller");
@@ -306,7 +306,7 @@ contract ExecutionEnvironment is Test {
             }
         }
 
-        bytes memory allocateData = abi.encodeWithSelector(IProtocolControl.allocatingCall.selector, abi.encode(totalEtherReward, bids));
+        bytes memory allocateData = abi.encodeWithSelector(IProtocolControl.allocatingCall.selector, abi.encode(totalEtherReward, bids, stagingReturnData));
 
         allocateData = abi.encodePacked(
             allocateData,

diff --git a/src/contracts/interfaces/IExecutionEnvironment.sol b/src/contracts/interfaces/IExecutionEnvironment.sol
@@ -24,7 +24,8 @@ interface IExecutionEnvironment {
     ) external payable;
 
     function allocateRewards(
-        BidData[] calldata bids // Converted to memory
+        BidData[] calldata bids, // Converted to memory
+        bytes memory stagingReturnData
     ) external;
 
     function getUser() external pure returns (address user);