remove stPROVE from Unstake event

Author: mattstam

contracts/.gas-snapshot

@@ -10,7 +10,7 @@ SuccinctStakingCancelSlashTests:test_CancelSlash_WhenExactBoundaryTiming() (gas:
 SuccinctStakingCancelSlashTests:test_CancelSlash_WhenGovernanceCanFinishImmediately() (gas: 240295)
 SuccinctStakingCancelSlashTests:test_CancelSlash_WhenMultipleSlashesCanBeCancelledIndependently() (gas: 218874)
 SuccinctStakingCancelSlashTests:test_CancelSlash_WhenNonOwnerCancelsAfterDeadline() (gas: 138154)
-SuccinctStakingCancelSlashTests:test_CancelSlash_WhenStakersCanUnstakeAfterCancellation() (gas: 381327)
+SuccinctStakingCancelSlashTests:test_CancelSlash_WhenStakersCanUnstakeAfterCancellation() (gas: 363049)
 SuccinctStakingCancelSlashTests:test_RevertCancelSlash_WhenAlreadyResolved() (gas: 137407)
 SuccinctStakingCancelSlashTests:test_RevertCancelSlash_WhenNonOwnerCancelsEarly() (gas: 132940)
 SuccinctStakingDispenseTests:test_Dispense_WhenConsecutiveWithWaiting() (gas: 580194)
@@ -30,76 +30,76 @@ SuccinctStakingDispenseTests:test_Dispense_WhenRateIsZero() (gas: 133785)
 SuccinctStakingDispenseTests:test_Dispense_WhenRateLimit() (gas: 510282)
 SuccinctStakingDispenseTests:test_Dispense_WhenReentrancyProtection() (gas: 172061)
 SuccinctStakingDispenseTests:test_Dispense_WhenTotalEarnedEqualsDispensedPlusAvailable() (gas: 295244)
-SuccinctStakingDispenseTests:test_Dispense_WhenValid() (gas: 600445)
+SuccinctStakingDispenseTests:test_Dispense_WhenValid() (gas: 582168)
 SuccinctStakingDispenseTests:test_Dispense_WhenVeryLargeTimePeriod() (gas: 576052)
 SuccinctStakingDispenseTests:test_RevertDispense_WhenNotEnoughPROVE() (gas: 56900)
 SuccinctStakingDispenseTests:test_Revert_WhenSetDispenseRate_WhenNotDispenser() (gas: 13531)
 SuccinctStakingDispenseTests:test_Revert_WhenSetDispenser_WhenNotOwner() (gas: 15778)
 SuccinctStakingDispenseTests:test_SetDispenseRate_WhenValid() (gas: 37299)
 SuccinctStakingDispenseTests:test_SetDispenser_WhenValid() (gas: 22253)
 SuccinctStakingFulfillmentTests:test_RevertReward_WhenProverNotFound() (gas: 12788)
-SuccinctStakingFulfillmentTests:test_Reward_WhenPartialUnstake() (gas: 924663)
-SuccinctStakingFulfillmentTests:test_Reward_WhenTwoStakersOneProverRewardDistributedAfterBothStake() (gas: 1078446)
-SuccinctStakingFulfillmentTests:test_Reward_WhenTwoStakersOneProverRewardOnlyDistributedAfterFirstStake() (gas: 1096968)
-SuccinctStakingFulfillmentTests:test_Reward_WhenTwoStakersTwoProversBothRewarded() (gas: 1327528)
-SuccinctStakingFulfillmentTests:test_Reward_WhenTwoStakersTwoProversOneRewarded() (gas: 1206436)
-SuccinctStakingFulfillmentTests:test_Reward_WhenUnstaked() (gas: 774378)
+SuccinctStakingFulfillmentTests:test_Reward_WhenPartialUnstake() (gas: 889788)
+SuccinctStakingFulfillmentTests:test_Reward_WhenTwoStakersOneProverRewardDistributedAfterBothStake() (gas: 1041891)
+SuccinctStakingFulfillmentTests:test_Reward_WhenTwoStakersOneProverRewardOnlyDistributedAfterFirstStake() (gas: 1060412)
+SuccinctStakingFulfillmentTests:test_Reward_WhenTwoStakersTwoProversBothRewarded() (gas: 1290973)
+SuccinctStakingFulfillmentTests:test_Reward_WhenTwoStakersTwoProversOneRewarded() (gas: 1169880)
+SuccinctStakingFulfillmentTests:test_Reward_WhenUnstaked() (gas: 756100)
 SuccinctStakingFulfillmentTests:test_Reward_WhenValid() (gas: 590301)
 SuccinctStakingInitalizationTests:test_RevertInitialize_WhenAlreadyInitialized() (gas: 27195)
-SuccinctStakingInitalizationTests:test_RevertInitialize_WhenNotOwner() (gas: 4632743)
+SuccinctStakingInitalizationTests:test_RevertInitialize_WhenNotOwner() (gas: 4618694)
 SuccinctStakingMiscellaneousTests:test_Misc_BelowMinimumStake() (gas: 145046)
-SuccinctStakingMiscellaneousTests:test_Misc_CannotAvoidSlashingByUnstaking() (gas: 782064)
+SuccinctStakingMiscellaneousTests:test_Misc_CannotAvoidSlashingByUnstaking() (gas: 763787)
 SuccinctStakingMiscellaneousTests:test_Misc_CannotSwitchProvers() (gas: 459678)
-SuccinctStakingMiscellaneousTests:test_Misc_ConcurrentOperations() (gas: 1194917)
+SuccinctStakingMiscellaneousTests:test_Misc_ConcurrentOperations() (gas: 1158362)
 SuccinctStakingMiscellaneousTests:test_Misc_DispenseOneWei() (gas: 160184)
 SuccinctStakingMiscellaneousTests:test_Misc_DispenseOverflow() (gas: 160045)
 SuccinctStakingMiscellaneousTests:test_Misc_DispenseZeroTime() (gas: 163513)
-SuccinctStakingMiscellaneousTests:test_Misc_DustAmountsCanBeUnstaked() (gas: 765715)
-SuccinctStakingMiscellaneousTests:test_Misc_ExactMinimumStake() (gas: 611260)
-SuccinctStakingMiscellaneousTests:test_Misc_ExactTimingBoundaries() (gas: 517282)
+SuccinctStakingMiscellaneousTests:test_Misc_DustAmountsCanBeUnstaked() (gas: 730840)
+SuccinctStakingMiscellaneousTests:test_Misc_ExactMinimumStake() (gas: 592982)
+SuccinctStakingMiscellaneousTests:test_Misc_ExactTimingBoundaries() (gas: 499004)
 SuccinctStakingMiscellaneousTests:test_Misc_ExchangeRateManipulation() (gas: 722604)
 SuccinctStakingMiscellaneousTests:test_Misc_FinishUnstakeNoClaims() (gas: 369919)
 SuccinctStakingMiscellaneousTests:test_Misc_FrontrunningRewardDistribution() (gas: 614396)
 SuccinctStakingMiscellaneousTests:test_Misc_MaxUint256Operations() (gas: 390861)
-SuccinctStakingMiscellaneousTests:test_Misc_MaximumStakeValues() (gas: 610700)
-SuccinctStakingMiscellaneousTests:test_Misc_MultiplePartialUnstakesExceedBalance() (gas: 572436)
-SuccinctStakingMiscellaneousTests:test_Misc_MultipleUnstakeRequestsCannotDrainFunds() (gas: 525876)
+SuccinctStakingMiscellaneousTests:test_Misc_MaximumStakeValues() (gas: 592423)
+SuccinctStakingMiscellaneousTests:test_Misc_MultiplePartialUnstakesExceedBalance() (gas: 550303)
+SuccinctStakingMiscellaneousTests:test_Misc_MultipleUnstakeRequestsCannotDrainFunds() (gas: 507598)
 SuccinctStakingMiscellaneousTests:test_Misc_NonOwnerCannotSlash() (gas: 469677)
 SuccinctStakingMiscellaneousTests:test_Misc_PermitExpiredDeadline() (gas: 34217)
-SuccinctStakingMiscellaneousTests:test_Misc_RestakeAfterFullUnstake() (gas: 867580)
+SuccinctStakingMiscellaneousTests:test_Misc_RestakeAfterFullUnstake() (gas: 849302)
 SuccinctStakingMiscellaneousTests:test_Misc_RewardAndSlashSameBlock() (gas: 619246)
-SuccinctStakingMiscellaneousTests:test_Misc_RoundingErrorsDoNotAccumulate() (gas: 3844862)
+SuccinctStakingMiscellaneousTests:test_Misc_RoundingErrorsDoNotAccumulate() (gas: 3677206)
 SuccinctStakingMiscellaneousTests:test_Misc_SlashExactTimingBoundary() (gas: 548832)
 SuccinctStakingMiscellaneousTests:test_Misc_SlashInvalidIndex() (gas: 472039)
 SuccinctStakingMiscellaneousTests:test_Misc_UnstakeMoreThanBalance() (gas: 372440)
-SuccinctStakingMiscellaneousTests:test_Misc_UnstakeQueueDoS() (gas: 4937965)
+SuccinctStakingMiscellaneousTests:test_Misc_UnstakeQueueDoS() (gas: 4755189)
 SuccinctStakingMiscellaneousTests:test_Misc_VaultReturnsZero() (gas: 457157)
 SuccinctStakingMiscellaneousTests:test_Misc_ZeroProverAddress() (gas: 19892)
 SuccinctStakingRegistryTests:test_CreateProver_WhenValid() (gas: 1645914)
 SuccinctStakingRegistryTests:test_RevertCreateProver_WhenAlreadyCreated() (gas: 1640377)
 SuccinctStakingSetupTests:test_SetUp() (gas: 127994)
 SuccinctStakingSlashTests:test_RevertSlash_WhenProverNotFound() (gas: 413960)
-SuccinctStakingSlashTests:test_Slash_Events() (gas: 848228)
+SuccinctStakingSlashTests:test_Slash_Events() (gas: 826095)
 SuccinctStakingSlashTests:test_Slash_Events_WhenDeactivated() (gas: 582573)
-SuccinctStakingSlashTests:test_Slash_WhenCancelled() (gas: 663404)
-SuccinctStakingSlashTests:test_Slash_WhenCumulativeSlashAmountExceedsBalance() (gas: 714094)
-SuccinctStakingSlashTests:test_Slash_WhenDispenseAfterFullSlash() (gas: 701577)
-SuccinctStakingSlashTests:test_Slash_WhenDispenseBeforeFullSlash() (gas: 685770)
-SuccinctStakingSlashTests:test_Slash_WhenFactorZeroResetWithDeactivation() (gas: 670569)
-SuccinctStakingSlashTests:test_Slash_WhenFullAmount() (gas: 663779)
+SuccinctStakingSlashTests:test_Slash_WhenCancelled() (gas: 645126)
+SuccinctStakingSlashTests:test_Slash_WhenCumulativeSlashAmountExceedsBalance() (gas: 695814)
+SuccinctStakingSlashTests:test_Slash_WhenDispenseAfterFullSlash() (gas: 683297)
+SuccinctStakingSlashTests:test_Slash_WhenDispenseBeforeFullSlash() (gas: 667490)
+SuccinctStakingSlashTests:test_Slash_WhenFactorZeroResetWithDeactivation() (gas: 652289)
+SuccinctStakingSlashTests:test_Slash_WhenFullAmount() (gas: 645499)
 SuccinctStakingSlashTests:test_Slash_WhenFullSlashDeactivatesProver() (gas: 498582)
-SuccinctStakingSlashTests:test_Slash_WhenMultipleSlashesBeforeUnstakeFinish() (gas: 906770)
-SuccinctStakingSlashTests:test_Slash_WhenPartialAmount() (gas: 707847)
+SuccinctStakingSlashTests:test_Slash_WhenMultipleSlashesBeforeUnstakeFinish() (gas: 888492)
+SuccinctStakingSlashTests:test_Slash_WhenPartialAmount() (gas: 689569)
 SuccinctStakingSlashTests:test_Slash_WhenPartialSlashEventuallyDeactivates() (gas: 779779)
 SuccinctStakingSlashTests:test_Slash_WhenRequestingWhenProverHasNoStake() (gas: 143769)
 SuccinctStakingSlashTests:test_Slash_WhenRewardAfterFullSlash() (gas: 606196)
-SuccinctStakingSlashTests:test_Slash_WhenSingleSlashAmountExceedsBalance() (gas: 650349)
-SuccinctStakingSlashTests:test_Slash_WhenSlashExceedsVaultButNotTotal() (gas: 794472)
+SuccinctStakingSlashTests:test_Slash_WhenSingleSlashAmountExceedsBalance() (gas: 632069)
+SuccinctStakingSlashTests:test_Slash_WhenSlashExceedsVaultButNotTotal() (gas: 776194)
 SuccinctStakingSlashTests:test_Slash_WhenStakeBlockedAfterDeactivation() (gas: 530040)
-SuccinctStakingSlashTests:test_Slash_WhenTwoProversDispenseAfterOneFullSlash() (gas: 1121821)
-SuccinctStakingSlashTests:test_Slash_WhenTwoStakersDispenseBeforeFullSlash() (gas: 941839)
-SuccinctStakingSlashTests:test_Slash_WhenTwoStakersFullSlash() (gas: 905827)
-SuccinctStakingSlashTests:test_Slash_WhenVaultDrainedToZero() (gas: 658125)
+SuccinctStakingSlashTests:test_Slash_WhenTwoProversDispenseAfterOneFullSlash() (gas: 1085264)
+SuccinctStakingSlashTests:test_Slash_WhenTwoStakersDispenseBeforeFullSlash() (gas: 905279)
+SuccinctStakingSlashTests:test_Slash_WhenTwoStakersFullSlash() (gas: 869267)
+SuccinctStakingSlashTests:test_Slash_WhenVaultDrainedToZero() (gas: 639848)
 SuccinctStakingStakeTests:test_PermitAndStake_WhenAttackerFrontruns() (gas: 402373)
 SuccinctStakingStakeTests:test_PermitAndStake_WhenLessThanApproved() (gas: 419932)
 SuccinctStakingStakeTests:test_PermitAndStake_WhenValid() (gas: 415464)
@@ -126,34 +126,34 @@ SuccinctStakingTransferTests:test_RevertWithdraw_WhenDirectiPROVEFromProver() (g
 SuccinctStakingTransferTests:test_RevertWithdraw_WhenDirectiPROVEFromStaker() (gas: 387776)
 SuccinctStakingTransferTests:test_Transfer_WhenProve() (gas: 23892)
 SuccinctStakingUnstakeTests:test_RevertUnstake_WhenAmountExceedsBalance() (gas: 410596)
-SuccinctStakingUnstakeTests:test_RevertUnstake_WhenFinishUnstakeWhileProverHasSlashRequest() (gas: 605901)
+SuccinctStakingUnstakeTests:test_RevertUnstake_WhenFinishUnstakeWhileProverHasSlashRequest() (gas: 583768)
 SuccinctStakingUnstakeTests:test_RevertUnstake_WhenRequestUnstakeWhileProverHasSlashRequest() (gas: 505344)
-SuccinctStakingUnstakeTests:test_RevertUnstake_WhenTooManyUnstakeRequests() (gas: 1672082)
+SuccinctStakingUnstakeTests:test_RevertUnstake_WhenTooManyUnstakeRequests() (gas: 1448867)
 SuccinctStakingUnstakeTests:test_RevertUnstake_WhenZeroAmount() (gas: 401029)
-SuccinctStakingUnstakeTests:test_Unstake_WhenEarlyAttempt() (gas: 551619)
-SuccinctStakingUnstakeTests:test_Unstake_WhenManySmallStakesUnstakes() (gas: 1299169)
-SuccinctStakingUnstakeTests:test_Unstake_WhenManySmallStakesUnstakesTimeBetween() (gas: 1303129)
-SuccinctStakingUnstakeTests:test_Unstake_WhenManySmallUnstakes() (gas: 1525989)
-SuccinctStakingUnstakeTests:test_Unstake_WhenMaxRequestsReset() (gas: 2700392)
-SuccinctStakingUnstakeTests:test_Unstake_WhenMultipleRequestsSumToFull() (gas: 619245)
-SuccinctStakingUnstakeTests:test_Unstake_WhenMultipleRewards() (gas: 892193)
-SuccinctStakingUnstakeTests:test_Unstake_WhenMultipleUnstakes() (gas: 715453)
-SuccinctStakingUnstakeTests:test_Unstake_WhenOneStakerTwoProversRewardNonDelegated() (gas: 1029996)
-SuccinctStakingUnstakeTests:test_Unstake_WhenProverFullSlashAfterEscrow() (gas: 652264)
-SuccinctStakingUnstakeTests:test_Unstake_WhenProverFullSlashBeforeEscrow() (gas: 606556)
-SuccinctStakingUnstakeTests:test_Unstake_WhenProverPartialSlashAfterEscrow() (gas: 649274)
-SuccinctStakingUnstakeTests:test_Unstake_WhenProverPartialSlashBeforeEscrow() (gas: 670177)
-SuccinctStakingUnstakeTests:test_Unstake_WhenRequestAfterSlash() (gas: 1057186)
-SuccinctStakingUnstakeTests:test_Unstake_WhenRewardDuringOngoingUnstake() (gas: 888856)
-SuccinctStakingUnstakeTests:test_Unstake_WhenRewardDuringOngoingUnstakeOutOfOrder() (gas: 888840)
-SuccinctStakingUnstakeTests:test_Unstake_WhenRewardDuringUnstakePeriod() (gas: 865085)
-SuccinctStakingUnstakeTests:test_Unstake_WhenSlashDuringUnstakePeriod() (gas: 799001)
-SuccinctStakingUnstakeTests:test_Unstake_WhenSomeClaimsReadyOthersNot() (gas: 1083041)
-SuccinctStakingUnstakeTests:test_Unstake_WhenSomeoneElseFinishesUnstake() (gas: 563772)
-SuccinctStakingUnstakeTests:test_Unstake_WhenTwoClaimsMixedReady() (gas: 636471)
-SuccinctStakingUnstakeTests:test_Unstake_WhenTwoStakersOneProverReward() (gas: 1107176)
-SuccinctStakingUnstakeTests:test_Unstake_WhenTwoStakersTwoProversDispenseOnly() (gas: 1008382)
-SuccinctStakingUnstakeTests:test_Unstake_WhenValid() (gas: 635836)
+SuccinctStakingUnstakeTests:test_Unstake_WhenEarlyAttempt() (gas: 533341)
+SuccinctStakingUnstakeTests:test_Unstake_WhenManySmallStakesUnstakes() (gas: 1280792)
+SuccinctStakingUnstakeTests:test_Unstake_WhenManySmallStakesUnstakesTimeBetween() (gas: 1284752)
+SuccinctStakingUnstakeTests:test_Unstake_WhenManySmallUnstakes() (gas: 1474218)
+SuccinctStakingUnstakeTests:test_Unstake_WhenMaxRequestsReset() (gas: 2354172)
+SuccinctStakingUnstakeTests:test_Unstake_WhenMultipleRequestsSumToFull() (gas: 574979)
+SuccinctStakingUnstakeTests:test_Unstake_WhenMultipleRewards() (gas: 873763)
+SuccinctStakingUnstakeTests:test_Unstake_WhenMultipleUnstakes() (gas: 680378)
+SuccinctStakingUnstakeTests:test_Unstake_WhenOneStakerTwoProversRewardNonDelegated() (gas: 993441)
+SuccinctStakingUnstakeTests:test_Unstake_WhenProverFullSlashAfterEscrow() (gas: 633984)
+SuccinctStakingUnstakeTests:test_Unstake_WhenProverFullSlashBeforeEscrow() (gas: 588276)
+SuccinctStakingUnstakeTests:test_Unstake_WhenProverPartialSlashAfterEscrow() (gas: 630996)
+SuccinctStakingUnstakeTests:test_Unstake_WhenProverPartialSlashBeforeEscrow() (gas: 651900)
+SuccinctStakingUnstakeTests:test_Unstake_WhenRequestAfterSlash() (gas: 1020036)
+SuccinctStakingUnstakeTests:test_Unstake_WhenRewardDuringOngoingUnstake() (gas: 851999)
+SuccinctStakingUnstakeTests:test_Unstake_WhenRewardDuringOngoingUnstakeOutOfOrder() (gas: 851982)
+SuccinctStakingUnstakeTests:test_Unstake_WhenRewardDuringUnstakePeriod() (gas: 846655)
+SuccinctStakingUnstakeTests:test_Unstake_WhenSlashDuringUnstakePeriod() (gas: 780419)
+SuccinctStakingUnstakeTests:test_Unstake_WhenSomeClaimsReadyOthersNot() (gas: 990403)
+SuccinctStakingUnstakeTests:test_Unstake_WhenSomeoneElseFinishesUnstake() (gas: 545494)
+SuccinctStakingUnstakeTests:test_Unstake_WhenTwoClaimsMixedReady() (gas: 598860)
+SuccinctStakingUnstakeTests:test_Unstake_WhenTwoStakersOneProverReward() (gas: 1070621)
+SuccinctStakingUnstakeTests:test_Unstake_WhenTwoStakersTwoProversDispenseOnly() (gas: 971827)
+SuccinctStakingUnstakeTests:test_Unstake_WhenValid() (gas: 619438)
 SuccinctTokenTest:test_InitialOwner() (gas: 12700)
 SuccinctTokenTest:test_Mint_WhenOwner() (gas: 60886)
 SuccinctTokenTest:test_RevertMint_WhenNotOwner() (gas: 10986)

contracts/src/SuccinctStaking.sol

@@ -308,7 +308,6 @@ contract SuccinctStaking is
         // Record the unstake request.
         unstakeClaims[msg.sender].push(
             UnstakeClaim({
-                stPROVE: _stPROVE,
                 iPROVEEscrow: iPROVEEscrow,
                 slashFactor: pool.slashFactor,
                 timestamp: block.timestamp
@@ -611,7 +610,7 @@ contract SuccinctStaking is
             PROVE = IERC4626(iProve).redeem(iPROVEScaled, _staker, address(this));
         }
 
-        emit Unstake(_staker, _prover, PROVE, iPROVEScaled, _claim.stPROVE);
+        emit Unstake(_staker, _prover, PROVE, iPROVEScaled);
     }
 
     /// @dev Iterate over the unstake claims, processing each one that has passed the unstake

contracts/src/interfaces/ISuccinctStaking.sol

@@ -5,13 +5,11 @@ import {IProverRegistry} from "./IProverRegistry.sol";
 
 interface ISuccinctStaking is IProverRegistry {
     /// @dev Represents a claim for unstaking.
-    /// @param stPROVE The share amount of $stPROVE requested to be unstaked.
     /// @param iPROVEEscrow The escrowed amount of $iPROVE at request time.
     /// @param slashFactor The slash factor for the prover when the claim was created (1e27 fp).
     /// @param timestamp The timestamp when the unstake was requested. Used for comparing against
     ///        the `unstakePeriod()` to determine if the claim can be finished.
     struct UnstakeClaim {
-        uint256 stPROVE;
         uint256 iPROVEEscrow;
         uint256 slashFactor;
         uint256 timestamp;
@@ -61,13 +59,7 @@ interface ISuccinctStaking is IProverRegistry {
     );
 
     /// @dev Emitted when a staker unstakes from a prover.
-    event Unstake(
-        address indexed staker,
-        address indexed prover,
-        uint256 PROVE,
-        uint256 iPROVE,
-        uint256 stPROVE
-    );
+    event Unstake(address indexed staker, address indexed prover, uint256 PROVE, uint256 iPROVE);
 
     /// @dev Emitted when a prover is requested to be slashed.
     event SlashRequest(address indexed prover, uint256 iPROVE, uint256 index);

contracts/src/mocks/MockStaking.sol

@@ -112,7 +112,6 @@ contract MockStaking is ProverRegistry, ISuccinctStaking {
 
         unstakeClaims[msg.sender].push(
             UnstakeClaim({
-                stPROVE: _stPROVE,
                 iPROVEEscrow: _stPROVE,
                 slashFactor: pool.slashFactor,
                 timestamp: block.timestamp

contracts/test/SuccinctStaking.unstake.t.sol

@@ -36,6 +36,8 @@ contract SuccinctStakingUnstakeTests is SuccinctStakingTest {
         assertEq(poolBefore.slashFactor, 0, "Slash factor should be 0 before init");
 
         // Step 1: Submit unstake request
+        vm.expectEmit(true, true, true, true);
+        emit ISuccinctStaking.UnstakeRequest(STAKER_1, ALICE_PROVER, stakeAmount, stakeAmount);
         _requestUnstake(STAKER_1, stakeAmount);
 
         // After request unstake: stPROVE burned, iPROVE escrowed
@@ -65,7 +67,7 @@ contract SuccinctStakingUnstakeTests is SuccinctStakingTest {
         skip(UNSTAKE_PERIOD);
 
         vm.expectEmit(true, true, true, true);
-        emit ISuccinctStaking.Unstake(STAKER_1, ALICE_PROVER, stakeAmount, stakeAmount, stakeAmount);
+        emit ISuccinctStaking.Unstake(STAKER_1, ALICE_PROVER, stakeAmount, stakeAmount);
         vm.expectEmit(true, true, true, true);
         emit ISuccinctStaking.ProverUnbound(STAKER_1, ALICE_PROVER);
 
@@ -1225,7 +1227,6 @@ contract SuccinctStakingUnstakeTests is SuccinctStakingTest {
         SuccinctStaking.UnstakeClaim[] memory claimsAfter =
             SuccinctStaking(STAKING).unstakeRequests(STAKER_1);
         assertEq(claimsAfter.length, 1, "Should have 1 claim remaining");
-        assertEq(claimsAfter[0].stPROVE, secondClaim, "Second claim should remain intact");
 
         // Wait for second claim and finish
         skip(UNSTAKE_PERIOD / 2);