Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: improve UX of findCheckpointHints #750

Merged
merged 8 commits into from
Apr 13, 2023
Merged

Fix: improve UX of findCheckpointHints #750

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a0e1e8c
feat: findHints before finalize test
Jeday Apr 12, 2023
9c8b632
test: fix a test
folkyatina Apr 12, 2023
ac9ec7e
feat: findCheckpointHints returns NOT_FOUND for unfinalized request
folkyatina Apr 12, 2023
153869d
test: fix tests
folkyatina Apr 12, 2023
88d4770
💅: better readability for the checks
folkyatina Apr 12, 2023
428e96b
Merge remote-tracking branch 'origin/fix/shapella-upgrade-from-rc1-to…
folkyatina Apr 12, 2023
bf72894
📚: improve WQ docs
folkyatina Apr 13, 2023
3ffc69c
📚: wq docs improvement
folkyatina Apr 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
💅: better readability for the checks
  • Loading branch information
@folkyatina
folkyatina committed Apr 12, 2023
commit 88d477057d02e6e2fb357ad7dc10842ab1dd2cd5
3 changes: 1 addition & 2 deletions contracts/0.8.9/WithdrawalQueueBase.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,10 +431,9 @@ abstract contract WithdrawalQueueBase {
/// or 0 if hint not found in the range
function _findCheckpointHint(uint256 _requestId, uint256 _start, uint256 _end) internal view returns (uint256) {
if (_requestId == 0 || _requestId > getLastRequestId()) revert InvalidRequestId(_requestId);
if (_start == 0) revert InvalidRequestIdRange(_start, _end);

uint256 lastCheckpointIndex = getLastCheckpointIndex();
if (_end > lastCheckpointIndex) revert InvalidRequestIdRange(_start, _end);
if (_start == 0 || _end > lastCheckpointIndex) revert InvalidRequestIdRange(_start, _end);

if (lastCheckpointIndex == 0 || _requestId > getLastFinalizedRequestId() || _start > _end) return NOT_FOUND;

Expand Down