addressed comments

Layr-Labs · Dec 26, 2023 · dcf8a04 · dcf8a04
1 parent 8ea334d
commit dcf8a04
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/src/contracts/interfaces/IEigenPodManager.sol b/src/contracts/interfaces/IEigenPodManager.sol
@@ -49,8 +49,8 @@ interface IEigenPodManager is IPausable {
     struct WithdrawalCallbackInfo {
         // oracle timestamp
         uint64 oracleTimestamp;
-        // prover fee
-        uint64 feeGwei;
+        // prover fee for each pod being proven for
+        uint64[] feesGwei;
         /// @notice SNARK proof acting as the cryptographic seal over the execution results.
         bytes seal;
         /// @notice Digest of the zkVM SystemState after execution.

diff --git a/src/contracts/pods/EigenPod.sol b/src/contracts/pods/EigenPod.sol
@@ -442,15 +442,17 @@ contract EigenPod is IEigenPod, Initializable, ReentrancyGuardUpgradeable, Eigen
         require(verifiedPartialWithdrawal.mostRecentWithdrawalTimestamp == mostRecentWithdrawalTimestamp, "EigenPod.fulfillPartialWithdrawalProofRequest: proven mostRecentWithdrawalTimestamp must match mostRecentWithdrawalTimestamp in the EigenPod");
         require(mostRecentWithdrawalTimestamp < verifiedPartialWithdrawal.endTimestamp, "EigenPod.fulfillPartialWithdrawalProofRequest: mostRecentWithdrawalTimestamp must precede endTimestamp");
 
-        require(sumOfPartialWithdrawalsClaimedViaMerkleProvenGwei + feeGwei <= verifiedPartialWithdrawal.provenPartialWithdrawalSumGwei, "EigenPod.fulfillPartialWithdrawalProofRequest: proven sum must be less than or equal to provenPartialWithdrawalSumGwei + feeGwei");
+        require(sumOfPartialWithdrawalsClaimedViaMerkleProvenGwei <= verifiedPartialWithdrawal.provenPartialWithdrawalSumGwei - feeGwei, "EigenPod.fulfillPartialWithdrawalProofRequest: proven sum must be less than or equal to provenPartialWithdrawalSumGwei + feeGwei");
         uint64 provenPartialWithdrawalSumGwei = verifiedPartialWithdrawal.provenPartialWithdrawalSumGwei;
         provenPartialWithdrawalSumGwei -= feeGwei;
 
 
         // subtract an partial withdrawals that may have been claimed via merkle proofs
-        provenPartialWithdrawalSumGwei -= sumOfPartialWithdrawalsClaimedViaMerkleProvenGwei;
-        sumOfPartialWithdrawalsClaimedViaMerkleProvenGwei = 0;
-        _sendETH_AsDelayedWithdrawal(podOwner, provenPartialWithdrawalSumGwei);
+        if(provenPartialWithdrawalSumGwei > sumOfPartialWithdrawalsClaimedViaMerkleProvenGwei){
+            provenPartialWithdrawalSumGwei -= sumOfPartialWithdrawalsClaimedViaMerkleProvenGwei;
+            sumOfPartialWithdrawalsClaimedViaMerkleProvenGwei = 0;
+            _sendETH_AsDelayedWithdrawal(podOwner, provenPartialWithdrawalSumGwei);
+        }
 
         mostRecentWithdrawalTimestamp = verifiedPartialWithdrawal.endTimestamp;
 

diff --git a/src/contracts/pods/EigenPodManager.sol b/src/contracts/pods/EigenPodManager.sol
@@ -237,7 +237,7 @@ contract EigenPodManager is
 
             // these checks are verified in the snark, we add them here again as a sanity check
             require(callbackInfo.oracleTimestamp >= journal.endTimestamps[i], "EigenPodManager.proofServiceCallback: oracle timestamp must be greater than or equal to callback timestamp");
-            require(callbackInfo.feeGwei <= journal.maxFeesGwei[i], "EigenPodManager.proofServiceCallback: fee must be less than or equal to maxFee");
+            require(callbackInfo.feesGwei[i] <= journal.maxFeesGwei[i], "EigenPodManager.proofServiceCallback: fee must be less than or equal to maxFee");
 
             //ensure the correct pod is being called
             IEigenPod pod = ownerToPod[journal.podOwners[i]];
@@ -248,7 +248,6 @@ contract EigenPodManager is
                 provenPartialWithdrawalSumGwei:  journal.provenPartialWithdrawalSumsGwei[i],
                 mostRecentWithdrawalTimestamp: journal.mostRecentWithdrawalTimestamps[i],
                 endTimestamp: journal.endTimestamps[i]
-
             });
 
             pod.fulfillPartialWithdrawalProofRequest(partialWithdrawal, callbackInfo.feeGwei, proofService.feeRecipient);

diff --git a/src/test/unit/EigenPodUnit.t.sol b/src/test/unit/EigenPodUnit.t.sol
@@ -1052,8 +1052,10 @@ contract EigenPodUnitTests_OffchainPartialWithdrawalProofTests is EigenPodUnitTe
     }
 
     function testFuzz_proofCallbackRequest_PartialWithdrawalSumEqualsAlreadyProvenSum(uint64 endTimestamp, uint64 sumOfPartialWithdrawalsClaimedGwei, uint64 provenAmount, uint64 fee) external {
+        cheats.assume(sumOfPartialWithdrawalsClaimedGwei < 1000);
+        cheats.assume(fee < 1000);
         cheats.assume(sumOfPartialWithdrawalsClaimedGwei + fee > provenAmount);
-        cheats.assume(sumOfPartialWithdrawalsClaimedGwei + fee < 1000);
+
         cheats.assume(eigenPod.mostRecentWithdrawalTimestamp() < endTimestamp);
          bytes32 slot = bytes32(uint256(56)); 
         bytes32 value = bytes32(uint256(sumOfPartialWithdrawalsClaimedGwei));