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

Jump to bottom

New staking v3 dev #429

Draft
wants to merge 56 commits into
base: pushContracts-v3.0-dev
Choose a base branch
from
Draft

New staking v3 dev #429

wants to merge 56 commits into from

Conversation

Zartaj0
Copy link
Member

@Zartaj0 Zartaj0 commented Sep 30, 2024

No description provided.

Zartaj0 and others added 30 commits September 30, 2024 16:16
@Zartaj0
Add separate staking contracts
3e69152
@Zartaj0
separate interface for interactions
373fbc3
@Zartaj0
minor updates for compatibility
4375c5a
@Zartaj0
reverting the changes done for OZ-V5
d6f5c6c
@Zartaj0
changes in core/removal of staking
8bd9f10
@Zartaj0
minor changes in test files
d9da740
@Zartaj0
compilation successful
0b7e9b1
@Zartaj0
fix errors
4bd70df
@Zartaj0
Changes in core
b2c61c4
@Zartaj0
changes in staking
701e848
@Zartaj0
test addition
9ee87cb
@Zartaj0
additional fixes for failing tests
6c52596
@Zartaj0
fixes
cb79c80
@Zartaj0
updates for claim
9d783fc
@Zartaj0
updates
c188eed
@Zartaj0
fix claim
5936ac1
@Zartaj0
fix miss
e6d1cb9
@Zartaj0
fix failing CCR tests
25715ca
@Zartaj0
tests working
1e3f695
@Zartaj0
Foundation can claim
24f7217
@0xNilesh
refactor: modified the tests structure for separate staking modules
4ea9724
@0xNilesh
refactor: added share invariants
3a47493
@Zartaj0
Fix epochToTotal Update issue
ef3988d
@Zartaj0
walletShare being 0 test pass
db66d05
@0xNilesh
test: added invariants for unit tests
1cc73fc
@0xNilesh
test: added test cases for addWalletShares
5e692b1
@0xNilesh
test: added test cases for removeWalletShares
46c3677
@0xNilesh
test: added wallet staking events
93272fb
@0xNilesh
ci: merge branch 'new-staking-v3-dev' into tests/staking-v3
bd7500e
@0xNilesh
test: created test files for decrease and rewards claims
afb5b13
@Zartaj0 Zartaj0 linked an issue Oct 21, 2024 that may be closed by this pull request
😈 [Feature Enhancement] - <Combine reward claiming mechanism for Wallet Fee Share and token holders> #385
Open
@zaryab2000 zaryab2000 self-requested a review October 21, 2024 13:17
zaryab2000
zaryab2000 reviewed Oct 30, 2024
View reviewed changes
contracts/PushStaking/PushStaking.sol Outdated Show resolved Hide resolved
contracts/PushStaking/PushStaking.sol Outdated Show resolved Hide resolved
contracts/PushStaking/PushStaking.sol Show resolved Hide resolved
contracts/PushStaking/PushStaking.sol Show resolved Hide resolved
contracts/PushStaking/PushStaking.sol Outdated Show resolved Hide resolved
contracts/PushStaking/PushStaking.sol Show resolved Hide resolved
contracts/PushStaking/PushStaking.sol
/ epochToTotalShares[_epochId];
}

function claimShareRewards() external returns (uint256 rewards) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Critical To-Do:

  • As previously discussed, let's ensure a wallet cannot claim or get rewards for the same epoch when they were added.
  • Instead, if a Wallet is added at Epoch N, then the reward eligibility starts from Epoch N+1. @0xNilesh @Zartaj0

@Zartaj0 Zartaj0 mentioned this pull request Nov 6, 2024
Merged
@zaryab2000 zaryab2000 self-assigned this Nov 19, 2024
@zaryab2000 zaryab2000 added the priority-2 Medium priority label Nov 21, 2024
@zaryab2000 zaryab2000 requested a review from 0xNilesh December 10, 2024 03:59
@zaryab2000 zaryab2000 assigned 0xNilesh and unassigned zaryab2000 Dec 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zaryab2000 zaryab2000 zaryab2000 left review comments

@0xNilesh 0xNilesh Awaiting requested review from 0xNilesh

Assignees

@0xNilesh 0xNilesh

Labels
priority-2 Medium priority
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

😈 [Feature Enhancement] - <Combine reward claiming mechanism for Wallet Fee Share and token holders>
3 participants
@Zartaj0 @zaryab2000 @0xNilesh