Skip to content

Refactor staking#99

Merged
FletcherMan merged 149 commits intomainfrom
staking
Apr 29, 2024
Merged

Refactor staking#99
FletcherMan merged 149 commits intomainfrom
staking

Conversation

@SegueII
Copy link
Copy Markdown
Contributor

@SegueII SegueII commented Mar 11, 2024

No description provided.

timtide and others added 19 commits April 4, 2024 17:59
* feat(l2staking): adding the L2 staking

* feat(l2staking): adding test cases for L2 staking

* feat(l2staking): harmonize interface names, modify undelegate

* feat(l2staking): modify delegate logic & adding test cases

* feat(l2staking)modify staking logic & test cases

* feat(l2staking) update sequencer & submitter

* feat(l2staking): update staking test cases

* fix(l2staking) fix conflicts
# Conflicts:
#	contracts/contracts/test/base/L1MessageBase.t.sol
#	contracts/contracts/test/base/L2MessageBase.t.sol
#	contracts/contracts/test/base/L2ToL1MessagePasser.t.sol
* feat: add morph token function

* feat: update mint function

* perfect morph token test

* modify package and yarn file

* optimize mint function

* improve mint features

* fix mint fail

* add comment

* add a conditional limit for the begin time

* mint function add return param

* add distribute contract

* optimize mint function

* optimize mint function

* modify distribute contract

---------

Co-authored-by: timtide <[email protected]>
# Conflicts:
#	contracts/contracts/L2/IMorphToken.sol
#	contracts/contracts/L2/MorphToken.sol
#	contracts/contracts/L2/staking/Distribute.sol
#	contracts/contracts/L2/staking/IDistribute.sol
#	contracts/contracts/test/base/MorphToken.t.sol
* feat: add morph token function

* feat: update mint function

* perfect morph token test

* modify package and yarn file

* optimize mint function

* improve mint features

* fix mint fail

* add comment

* add a conditional limit for the begin time

* mint function add return param

* add distribute contract

* optimize mint function

* optimize mint function

* modify distribute contract

* formatted file

---------

Co-authored-by: timtide <[email protected]>
@ryanmorphl2 ryanmorphl2 force-pushed the staking branch 2 times, most recently from 419367a to 0bac4a2 Compare April 26, 2024 11:02
ryanmorphl2 and others added 19 commits April 26, 2024 23:50
* fix L1 contract deploy

* fix L2 deploy

* update bindings
* update bindings

* rm getNextSubmitter

* add staking address param

* add IsStaker

* rename staking address flag

* update bindings

* update iface

---------

Co-authored-by: WorldDogs <[email protected]>
Co-authored-by: fletcher.fan <[email protected]>
* update bindings

* rm getNextSubmitter

* add staking address param

* add IsStaker

* rename staking address flag

* update bindings

* update iface

* add l2 clients

* rename env l1 staking address

---------

Co-authored-by: WorldDogs <[email protected]>
@FletcherMan FletcherMan merged commit 8c65f68 into main Apr 29, 2024
@FletcherMan FletcherMan deleted the staking branch April 29, 2024 04:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants