feat: Staking Router 1.5 #860

tamtamchik · 2024-10-11T16:22:51Z

Port of #78

Depending on the size of the third-phase report, it may be split into multiple transactions.

Distribute reward separately using the permissionless method in each staking module.

…-third-phase-fix Feat/multi transaction oracle third phase fix

Update contract version and reward distribution state.

Co-authored-by: avsetsin <[email protected]>

new parameter placed at the end of struct to preserve data order compatibility on read

…ontract

docs: description for sr deploy params

…1.5-deploy-scripts

…ocator Use steth on optimism locator impl to fetch addresses for SR2 deploy

SR 1.5 deploy scripts

…limit Update CL_BALANCE_ORACLES_ERROR_UPPER_BP_LIMIT

Deployed mainnet SR 1.5

# Conflicts: # scripts/scratch/steps/0130-grant-roles.ts # scripts/scratch/steps/0140-plug-staking-modules.ts

…velop-sync # Conflicts: # deployed-holesky.json # deployed-mainnet.json # test/0.8.9/oracle/hashConsensus.setQuorum.test.ts

chore: Sync SR1.5 branch with the latest develop

contracts/0.8.9/DepositSecurityModule.sol

contracts/0.8.9/StakingRouter.sol

github-actions · 2024-11-26T08:33:03Z

Hardhat Unit Tests Coverage Summary

Filename                                                       Stmts    Miss  Cover    Missing
-----------------------------------------------------------  -------  ------  -------  ---------
contracts/0.4.24/Lido.sol                                        212       0  100.00%
contracts/0.4.24/StETH.sol                                        72       0  100.00%
contracts/0.4.24/StETHPermit.sol                                  15       0  100.00%
contracts/0.4.24/lib/Packed64x4.sol                                5       0  100.00%
contracts/0.4.24/lib/SigningKeys.sol                              36       0  100.00%
contracts/0.4.24/lib/StakeLimitUtils.sol                          37       0  100.00%
contracts/0.4.24/nos/NodeOperatorsRegistry.sol                   512       0  100.00%
contracts/0.4.24/oracle/LegacyOracle.sol                          72       0  100.00%
contracts/0.4.24/utils/Pausable.sol                                9       0  100.00%
contracts/0.4.24/utils/Versioned.sol                               5       0  100.00%
contracts/0.6.12/WstETH.sol                                       17       0  100.00%
contracts/0.8.4/WithdrawalsManagerProxy.sol                       61       0  100.00%
contracts/0.8.9/BeaconChainDepositor.sol                          21       2  90.48%   48, 51
contracts/0.8.9/Burner.sol                                        71       0  100.00%
contracts/0.8.9/DepositSecurityModule.sol                        128       0  100.00%
contracts/0.8.9/EIP712StETH.sol                                   16       0  100.00%
contracts/0.8.9/LidoExecutionLayerRewardsVault.sol                16       0  100.00%
contracts/0.8.9/LidoLocator.sol                                   18       0  100.00%
contracts/0.8.9/OracleDaemonConfig.sol                            28       0  100.00%
contracts/0.8.9/StakingRouter.sol                                316       0  100.00%
contracts/0.8.9/WithdrawalQueue.sol                               88       0  100.00%
contracts/0.8.9/WithdrawalQueueBase.sol                          146       0  100.00%
contracts/0.8.9/WithdrawalQueueERC721.sol                         89       0  100.00%
contracts/0.8.9/WithdrawalVault.sol                               21       0  100.00%
contracts/0.8.9/lib/Math.sol                                       4       0  100.00%
contracts/0.8.9/lib/PositiveTokenRebaseLimiter.sol                22       0  100.00%
contracts/0.8.9/lib/UnstructuredRefStorage.sol                     2       0  100.00%
contracts/0.8.9/oracle/AccountingOracle.sol                      190       2  98.95%   189-190
contracts/0.8.9/oracle/BaseOracle.sol                             89       1  98.88%   397
contracts/0.8.9/oracle/HashConsensus.sol                         263       1  99.62%   1005
contracts/0.8.9/oracle/ValidatorsExitBusOracle.sol                91      91  0.00%    96-461
contracts/0.8.9/proxy/OssifiableProxy.sol                         17       0  100.00%
contracts/0.8.9/sanity_checks/OracleReportSanityChecker.sol      232       0  100.00%
contracts/0.8.9/utils/DummyEmptyContract.sol                       0       0  100.00%
contracts/0.8.9/utils/PausableUntil.sol                           31       0  100.00%
contracts/0.8.9/utils/Versioned.sol                               11       0  100.00%
contracts/0.8.9/utils/access/AccessControl.sol                    23       0  100.00%
contracts/0.8.9/utils/access/AccessControlEnumerable.sol           9       0  100.00%
contracts/testnets/sepolia/SepoliaDepositAdapter.sol              21      21  0.00%    49-100
TOTAL                                                           3016     118  96.09%

Diff against master

Filename                                                       Stmts    Miss  Cover
-----------------------------------------------------------  -------  ------  --------
contracts/0.4.24/nos/NodeOperatorsRegistry.sol                   +27       0  +100.00%
contracts/0.8.9/DepositSecurityModule.sol                        +24       0  +100.00%
contracts/0.8.9/StakingRouter.sol                                +13       0  +100.00%
contracts/0.8.9/oracle/AccountingOracle.sol                      +19      +1  -0.47%
contracts/0.8.9/sanity_checks/OracleReportSanityChecker.sol      +61       0  +100.00%
TOTAL                                                           +144      +1  +0.16%

Results for commit: 957fd2f

Minimum allowed coverage is 95%

♻️ This comment has been updated with latest results

krogla

lgtm

mkurayan and others added 30 commits May 23, 2024 18:08

feat: multi-transaction third phase for Accounting oracle

4831966

Depending on the size of the third-phase report, it may be split into multiple transactions.

feat: add addition tests for multi transactions

32cbe0e

feat: remove redundant code

1cee804

feat: fix sanity check

a6d21e4

feat: add additional test

0033f10

test: updates extra data state after previous day report

0f89eb4

feat: decouple reward distribution from the Accounting Oracle report

344651d

Distribute reward separately using the permissionless method in each staking module.

fix: data length check

c03af31

fix: redundant vars

1319d97

fix: check NO ids order in lastSortingKey

4c308be

fix: bitwise op refactor

ae2110f

Merge pull request #99 from lidofinance/feat/multi-transaction-oracle…

1345c44

…-third-phase-fix Feat/multi transaction oracle third phase fix

test: enforces extra data sorting order

55ba2b3

feat: change variable name

53ceb24

feat: node operator registry contract initialisation

a5b5571

Update contract version and reward distribution state.

feat: update deployment scripts for accounting sanity checker

0609069

Update contracts/0.8.9/oracle/AccountingOracle.sol

334ba92

Co-authored-by: avsetsin <[email protected]>

feat: update contract and consensus version in accounting oracle

093722d

test: submit extra data adjust node operators ids

21fb9be

feat: update the function description

c8f9a52

feat: accounting oracle contract improve formating

85a70fb

feat: use unstructured storage pattern for reward distribution state

ef9ddf5

feat: reshape limit list structure

0200458

new parameter placed at the end of struct to preserve data order compatibility on read

feat: update comment on get reward distribution state method in nor c…

5f9c9c0

…ontract

test: fix sanity checker tests

616e3ec

fix: make lib as external contract (reduce bytecode)

7779be8

fix: add priorityExitShareThreshold param

9c5f9cf

test: fix lib deploy in SR test

6387680

feat: targetLimitMode

d090d4a

fix: allocation strategy

97b5cbe

Amuhar and others added 22 commits September 26, 2024 18:46

Merge pull request #221 from lidofinance/feat/sr-1.5-deploy-scripts-desc

f44c9fe

docs: description for sr deploy params

Merge commit '1ffbb7e49e112fcac678f59bf63ba57a7e522874' into feat/sr-…

c53008c

…1.5-deploy-scripts

feat: use steth on optimism locator impl in sr2 deploy script

e5733bd

Merge pull request #226 from lidofinance/feat/sr-1.5-deploy-scripts-l…

9bd43f6

…ocator Use steth on optimism locator impl to fetch addresses for SR2 deploy

Merge pull request #110 from lidofinance/feat/sr-1.5-deploy-scripts

57a5167

SR 1.5 deploy scripts

feat: update cl balances oracle error upper limit

9e64ca0

docs: update forum post link to sr v2 upgrade announcement

643d46d

Merge pull request #227 from lidofinance/feat/sr-1.5-sc-oracle-upper-…

14904a6

…limit Update CL_BALANCE_ORACLES_ERROR_UPPER_BP_LIMIT

New deploy params

430e3db

Merge pull request #228 from lidofinance/deployed-mainnet-SR-1.5

737b675

Deployed mainnet SR 1.5

Merge branch 'develop' into feat/sr-1.5-develop-sync

4169110

# Conflicts: # scripts/scratch/steps/0130-grant-roles.ts # scripts/scratch/steps/0140-plug-staking-modules.ts

Merge remote-tracking branch 'origin/feat/sr-1.5' into feat/sr-1.5-de…

a9eacbd

…velop-sync # Conflicts: # deployed-holesky.json # deployed-mainnet.json # test/0.8.9/oracle/hashConsensus.setQuorum.test.ts

fix: scratch deploy

a2a846d

fix: linter

426fb06

chore: fix extra reporting by CSM

5e1925c

ci: update scratch deploy params

38310fc

test: fix nor distributer rewards

2518c9f

chore: update deps

6f96202

test(integration): restore happy path

1860a19

test(integration): restore accounting

25ab456

chore: fix linter warnings

9c0bc19

Merge pull request #858 from lidofinance/feat/sr-1.5-develop-sync

957fd2f

chore: Sync SR1.5 branch with the latest develop

github-advanced-security bot found potential problems Nov 26, 2024

View reviewed changes

contracts/0.8.9/DepositSecurityModule.sol Dismissed Show dismissed Hide dismissed

contracts/0.8.9/StakingRouter.sol Dismissed Show dismissed Hide dismissed

contracts/0.8.9/StakingRouter.sol Dismissed Show dismissed Hide dismissed

tamtamchik marked this pull request as ready for review November 26, 2024 09:05

tamtamchik requested review from a team as code owners November 26, 2024 09:05

krogla approved these changes Nov 26, 2024

View reviewed changes

krogla merged commit 39caac3 into develop Nov 26, 2024
10 checks passed

krogla deleted the feat/sr-1.5 branch November 26, 2024 12:00

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Staking Router 1.5 #860

feat: Staking Router 1.5 #860

tamtamchik commented Oct 11, 2024

github-actions bot commented Nov 26, 2024

krogla left a comment

feat: Staking Router 1.5 #860

feat: Staking Router 1.5 #860

Conversation

tamtamchik commented Oct 11, 2024

github-actions bot commented Nov 26, 2024

Hardhat Unit Tests Coverage Summary

Diff against master

krogla left a comment

Choose a reason for hiding this comment