fix: complete withdrawals #962
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8sunyuan
commented
Dec 17, 2024
| @@ -6619,6 +6539,8 @@ contract DelegationManagerUnitTests_completeQueuedWithdrawal is DelegationManage | |||
| strategyMock, | |||
| depositSharesPerWithdrawal | |||
| ); | |||
| withdrawal.nonce = nonce; | |||
| nonce += 1; | |||
There was a problem hiding this comment.
Note: this was needed because it was looping over creating queuedWithdrawalParams but each one was having a nonce of 0 from reading directly off the contract. I overwrite this value here since the expectation is that the withdrawals are queued in order with nonces from 0-3 inclusive
| // if the completion block is in the future, simply read current slashing factors | ||
| // still possible however for the slashing factors to change before the withdrawal is completable | ||
| // and the shares withdrawn to be less | ||
| if (completableBlock > uint32(block.number)) { |
There was a problem hiding this comment.
nit: could be a ternary (no biggie tho)
noticed it's also failing upstream, can fix if needed |
ypatil12
requested changes
Dec 18, 2024
| if (completableBlock > uint32(block.number)) { | ||
| slashingFactors = | ||
| _getSlashingFactors({staker: staker, operator: operator, strategies: withdrawals[i].strategies}); | ||
| // Read slashing factors at the completable block |
There was a problem hiding this comment.
Can we remove these from this PR
|
Closing in favor of #965 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Decided on removing numToComplete interface and this PR also fixes some broken tests.
Also fixes a race condition bug where a staker's withdrawal is still slashable in the same block that the withdrawal is completable, leading to possible race conditions. The regression test
test_getQueuedWithdrawals_SlashAfterWithdrawalCompletionon the view function found this and passes as a result of the fix.