Skip to content

staking-oracle: Optimization and deployment#279

Merged
curryxbo merged 156 commits intomainfrom
fix-stakingOracle
May 7, 2024
Merged

staking-oracle: Optimization and deployment#279
curryxbo merged 156 commits intomainfrom
fix-stakingOracle

Conversation

@curryxbo
Copy link
Copy Markdown
Contributor

@curryxbo curryxbo commented May 6, 2024

No description provided.

SegueII and others added 30 commits March 11, 2024 11:45
* 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]>
@curryxbo curryxbo changed the title WIP:Fix staking oracle Fix staking oracle May 6, 2024
@curryxbo curryxbo changed the title Fix staking oracle staking oracle Fix and Add testcase May 6, 2024
@curryxbo curryxbo changed the title staking oracle Fix and Add testcase staking-oracle: Optimization and deployment May 6, 2024
@curryxbo curryxbo merged commit 83fba09 into main May 7, 2024
@curryxbo curryxbo deleted the fix-stakingOracle branch May 7, 2024 02:35
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.

7 participants