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

Improved staking (new staking - part 2 - SWIP-20) #264

Merged
merged 41 commits into from
Aug 26, 2024
Merged

Improved staking (new staking - part 2 - SWIP-20) #264

merged 41 commits into from
Aug 26, 2024

Conversation

0xCardinalError
Copy link
Contributor

We have added potential and committed stake values to staking.
New staking mechanism for withdrawals per SWIP 20 ethersphere/SWIPs#49
There is also a new migration function for the future migration of stakes from the contract.

@0xCardinalError
rename to commitedStake
1f31392
@0xCardinalError
add potential stake and commited stake and update their amounts with …
bd828e6 
…deposit
@0xCardinalError
update from latest staking
75280ae
@0xCardinalError
add potential and commited stakes
c16f56c
@0xCardinalError
change to potentialStake
40e6d0e
@0xCardinalError
add effectiveStake as calculation
cbcac28
@0xCardinalError
remove minimum from redis and add it to staking
63d4081
@0xCardinalError
use just 2 params
dccbe4d
@0xCardinalError
substract commitedStake amount accordingly to currentPrice
658d9c0
@0xCardinalError
make new deployment procedure with new staking contracts
ae07e41
@0xCardinalError
add check if node has entered staking game
fd1cd1a
@0xCardinalError
fix redistribution tests to match new staking calculations
aa1d34e
@0xCardinalError
add migration code, fix staking code
f90d7b7
@0xCardinalError
remove logs
f1e9bbc
@0xCardinalError
add migration tests that checks values
03b5d86
@0xCardinalError
fix error in value changes, make withdrawl test
2dfab4e
@0xCardinalError
add few more tests
f838e56
@0xCardinalError 0xCardinalError changed the base branch from master to new_staking July 5, 2024 10:30
nugaon
nugaon reviewed Jul 8, 2024
View reviewed changes
src/Redistribution.sol Outdated Show resolved Hide resolved
src/Staking.sol Outdated Show resolved Hide resolved
src/Staking.sol Outdated Show resolved Hide resolved
src/Staking.sol Outdated Show resolved Hide resolved
src/Staking.sol Outdated Show resolved Hide resolved
test/Staking.test.ts Outdated Show resolved Hide resolved
test/Staking.test.ts Show resolved Hide resolved
test/Staking.test.ts Show resolved Hide resolved
test/Staking.test.ts Outdated Show resolved Hide resolved
src/Staking.sol Outdated Show resolved Hide resolved
@0xCardinalError 0xCardinalError marked this pull request as ready for review July 12, 2024 11:42
nugaon
nugaon approved these changes Jul 15, 2024
View reviewed changes
Copy link
Member

@nugaon nugaon left a comment

Choose a reason for hiding this comment

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

seems good!

src/Staking.sol Outdated Show resolved Hide resolved
src/Staking.sol Outdated Show resolved Hide resolved
src/Staking.sol Outdated Show resolved Hide resolved
@istae istae mentioned this pull request Jul 18, 2024
Merged
4 tasks
@0xCardinalError 0xCardinalError merged commit 0d6540e into new_staking Aug 26, 2024
1 check failed
@0xCardinalError 0xCardinalError deleted the new_staking_swip20 branch August 26, 2024 16:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nugaon nugaon nugaon approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@0xCardinalError @nugaon