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 typos #337

Merged
merged 4 commits into from
May 29, 2024
Merged

Fix typos #337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6c99a3c
fix typo
omahs May 26, 2024
7b5e29a
fix typos
omahs May 26, 2024
92fe4f5
Merge branch 'main' into patch-1
chengwenxi May 29, 2024
ff02fbb
Merge branch 'main' into patch-1
chengwenxi May 29, 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 contracts/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,6 @@ Test contracts should be named one of the following according to their use:
- `TargetContract_Function_Test` for contracts containing happy path tests for a given function.
- `TargetContract_Function_TestFail` for contracts containing sad path tests for a given function.

## Withdrawaing From Fee Vaults
## Withdrawing From Fee Vaults

See the file `scripts/FeeVaultWithdrawal.s.sol` to withdraw from the L2 fee vaults. It includes instructions on how to run it. `foundry` is required.
16 changes: 8 additions & 8 deletions contracts/contracts/Staking.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Morph token staking will be divided into three stages:
- Inflation starts and distribute staking rewards

1. `L1` Update whitelist
2. `L1` Regiter and stake eth to become staker
2. `L1` Register and stake eth to become staker
3. `L1->L2` Send {add staker} message
4. `L2` Update stakers
5. `L2` Delegate stake MorphToken to staker
Expand All @@ -31,7 +31,7 @@ Morph token staking will be divided into three stages:
**Slash Sequencers After Challenger Win**

- Sequencer will be confiscated all stake amount and removed from sequencer set if defense challenge fails
- Even if challenged repeatedly, each sequencer will only be slash once
- Even if challenged repeatedly, each sequencer will only be slashed once
- The reward for a successful challenge is a fixed proportion of the staking amount, and is greater than the challenge deposit
- If the slash causes the number of sequences to be 0, then the layer2 will stop running. We can restart by upgrading, reset stakers and sequencer set. This does not affect the security of the evm state

Expand All @@ -43,7 +43,7 @@ Morph token staking will be divided into three stages:
**Delegation Rewards**

- MorphToken is inflated at a fixed ratio every day, and the additional tokens are used as rewards for sequencers and delegators
- The sequencer and his delegators get MorphToken infaltion reward according to the block production ratio
- The sequencer and his delegators get MorphToken inflation reward according to the block production ratio
- Sequencer charges commission as its own income
- Users get remaining reward according to their delegation amount

Expand All @@ -56,7 +56,7 @@ Morph token staking will be divided into three stages:

The exit lock period should be long enough to ensure that stakers and sequencers in L2 have been updated

1. `L1` Apply to withdraw, remove from staker list, enter lock peroid
1. `L1` Apply to withdraw, remove from staker list, enter lock period
2. `L1->L2` Send {remove staker} message
3. `L2` Remove from stakers and sequencers if needed
4. `L1` Claim allowed until reach unlock height，remove staker info after claiming
Expand Down Expand Up @@ -121,10 +121,10 @@ The exit lock period should be long enough to ensure that stakers and sequencers

**Main functions**

- Record delegation info by l2 staing contract
- Record undelegation info by l2 staing contract
- Compute delegator's delegation reward, call form l2 staing contract
- Compute sequencer's commission, call form l2 staing contract
- Record delegation info by l2 staking contract
- Record undelegation info by l2 staking contract
- Compute delegator's delegation reward, call form l2 staking contract
- Compute sequencer's commission, call form l2 staking contract

#### Gov Contract

Expand Down
Loading