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 get all delegators in pagination #598

Merged
merged 7 commits into from
Nov 15, 2024
Merged

Fix get all delegators in pagination #598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b567e55
fix get all delegators in pagination
SegueII Oct 21, 2024
cc05d5d
update bindings
SegueII Oct 21, 2024
36bbf6a
Merge branch 'main' into fix-get-delegators
SegueII Nov 12, 2024
08aded3
Merge branch 'main' into fix-get-delegators
SegueII Nov 14, 2024
7387fe9
Merge branch 'main' into fix-get-delegators
SegueII Nov 15, 2024
61e1cf3
clean test
SegueII Nov 15, 2024
3e19f69
update bindings
SegueII Nov 15, 2024
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
2 changes: 1 addition & 1 deletion bindings/bin/l2staking_deployed.hex
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bindings/bindings/l2staking.go
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bindings/bindings/l2staking_more.go
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions contracts/contracts/l2/staking/L2Staking.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,8 +552,10 @@ contract L2Staking is IL2Staking, Staking, OwnableUpgradeable, ReentrancyGuardUp
if (end > (delegatorsTotalNumber - 1)) {
end = delegatorsTotalNumber - 1;
}
for (uint256 i = start; i <= end; i++) {
delegatorsInPage[i] = delegators[staker].at(i);
uint256 i = start;
uint256 j = 0;
while (i <= end) {
delegatorsInPage[j++] = delegators[staker].at(i++);
}
return (delegatorsTotalNumber, delegatorsInPage);
}
Expand Down
121 changes: 112 additions & 9 deletions contracts/contracts/test/L2Staking.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2196,17 +2196,120 @@ contract L2StakingTest is L2StakingBaseTest {
l2Staking.delegateStake(thirdStaker, 5 ether);
hevm.stopPrank();

(, address[] memory delegator0) = l2Staking.getAllDelegatorsInPagination(firstStaker, 10, 0);
(, address[] memory delegator1) = l2Staking.getAllDelegatorsInPagination(secondStaker, 10, 0);
(, address[] memory delegator2) = l2Staking.getAllDelegatorsInPagination(thirdStaker, 10, 0);
hevm.startPrank(alice1);
morphToken.approve(address(l2Staking), type(uint256).max);
l2Staking.delegateStake(firstStaker, 5 ether);
l2Staking.delegateStake(secondStaker, 5 ether);
hevm.stopPrank();

hevm.startPrank(alice2);
morphToken.approve(address(l2Staking), type(uint256).max);
l2Staking.delegateStake(firstStaker, 5 ether);
l2Staking.delegateStake(secondStaker, 5 ether);
hevm.stopPrank();

hevm.startPrank(alice3);
morphToken.approve(address(l2Staking), type(uint256).max);
l2Staking.delegateStake(firstStaker, 5 ether);
hevm.stopPrank();

assertEq(delegator0.length, 10);
assertEq(delegator1.length, 10);
assertEq(delegator2.length, 10);
hevm.startPrank(alice4);
morphToken.approve(address(l2Staking), type(uint256).max);
l2Staking.delegateStake(firstStaker, 5 ether);
hevm.stopPrank();

// check firstStaker
{
(uint256 total, address[] memory delegators) = l2Staking.getAllDelegatorsInPagination(firstStaker, 10, 0);
assertEq(total, 5);
assertEq(delegators.length, 10);
assertEq(delegators[0], alice);
assertEq(delegators[1], alice1);
assertEq(delegators[2], alice2);
assertEq(delegators[3], alice3);
assertEq(delegators[4], alice4);
assertEq(delegators[5], address(0));
}

assertEq(delegator0[0], alice);
assertEq(delegator1[0], alice);
assertEq(delegator2[0], alice);
{
(uint256 total, address[] memory delegators) = l2Staking.getAllDelegatorsInPagination(firstStaker, 1, 0);
assertEq(total, 5);
assertEq(delegators.length, 1);
assertEq(delegators[0], alice);
}

{
(uint256 total, address[] memory delegators) = l2Staking.getAllDelegatorsInPagination(firstStaker, 1, 1);
assertEq(total, 5);
assertEq(delegators.length, 1);
assertEq(delegators[0], alice1);
}

{
(uint256 total, address[] memory delegators) = l2Staking.getAllDelegatorsInPagination(firstStaker, 2, 2);
assertEq(total, 5);
assertEq(delegators.length, 2);
assertEq(delegators[0], alice4);
assertEq(delegators[1], address(0));
}

{
(uint256 total, address[] memory delegators) = l2Staking.getAllDelegatorsInPagination(firstStaker, 10, 3);
assertEq(total, 5);
assertEq(delegators.length, 10);
assertEq(delegators[0], address(0));
assertEq(delegators[1], address(0));
}

// check secondStaker
{
(uint256 total, address[] memory delegators) = l2Staking.getAllDelegatorsInPagination(secondStaker, 10, 0);
assertEq(total, 3);
assertEq(delegators.length, 10);
assertEq(delegators[0], alice);
assertEq(delegators[1], alice1);
assertEq(delegators[2], alice2);
assertEq(delegators[3], address(0));
}

{
(uint256 total, address[] memory delegators) = l2Staking.getAllDelegatorsInPagination(secondStaker, 2, 1);
assertEq(total, 3);
assertEq(delegators.length, 2);
assertEq(delegators[0], alice2);
assertEq(delegators[1], address(0));
}

{
(uint256 total, address[] memory delegators) = l2Staking.getAllDelegatorsInPagination(secondStaker, 2, 2);
assertEq(total, 3);
assertEq(delegators.length, 2);
assertEq(delegators[0], address(0));
assertEq(delegators[1], address(0));
}

// check thirdStaker
{
(uint256 total, address[] memory delegators) = l2Staking.getAllDelegatorsInPagination(thirdStaker, 10, 0);
assertEq(total, 1);
assertEq(delegators.length, 10);
assertEq(delegators[0], alice);
assertEq(delegators[1], address(0));
}

{
(uint256 total, address[] memory delegators) = l2Staking.getAllDelegatorsInPagination(thirdStaker, 1, 0);
assertEq(total, 1);
assertEq(delegators.length, 1);
assertEq(delegators[0], alice);
}

{
(uint256 total, address[] memory delegators) = l2Staking.getAllDelegatorsInPagination(thirdStaker, 1, 1);
assertEq(total, 1);
assertEq(delegators.length, 1);
assertEq(delegators[0], address(0));
}
}

/**
Expand Down
Loading