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.

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

chore: Sync SR1.5 branch with the latest develop #858

Merged
merged 667 commits into from
Nov 26, 2024

Conversation

tamtamchik
Copy link
Member

@tamtamchik tamtamchik commented Oct 11, 2024

Trying to make the update as smooth as possible 🫡

Restored CI actions, unit tests, and scratch deployment.

TODO:

  • fix integration tests on scratch (consider changes from SR1.5)
  • fix integration tests on the mainnet fork (add upgrade steps for applying changes from SR1.5 to protocol on the mainnet fork)
  • move /contracts/*/test_helpers/ to /test
    • rename based on __Mock / __Harness convention
    • format as other test contracts

Port of #216

tamtamchik and others added 30 commits August 28, 2024 16:20
Bumps [micromatch](https://github.com/micromatch/micromatch) from 4.0.7 to 4.0.8.
- [Release notes](https://github.com/micromatch/micromatch/releases)
- [Changelog](https://github.com/micromatch/micromatch/blob/master/CHANGELOG.md)
- [Commits](micromatch/micromatch@4.0.7...4.0.8)

---
updated-dependencies:
- dependency-name: micromatch
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
@tamtamchik tamtamchik requested a review from a team as a code owner October 11, 2024 16:08
@tamtamchik tamtamchik marked this pull request as draft October 11, 2024 16:08
@tamtamchik tamtamchik changed the base branch from master to develop October 11, 2024 16:09
@tamtamchik tamtamchik changed the title chore: update SR1.5 dev branch with latest changes from develop branch chore: Sync SR1.5 branch with the latest develop Oct 11, 2024
@tamtamchik tamtamchik changed the base branch from develop to feat/sr-1.5 November 7, 2024 06:57
Copy link

github-actions bot commented Nov 7, 2024

badge

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: 9c0bc19

Minimum allowed coverage is 95%

♻️ This comment has been updated with latest results

@tamtamchik tamtamchik marked this pull request as ready for review November 26, 2024 07:07
@tamtamchik tamtamchik requested review from mkurayan and a team and removed request for a team November 26, 2024 07:16
@krogla krogla merged commit 957fd2f into feat/sr-1.5 Nov 26, 2024
10 checks passed
@krogla krogla deleted the feat/sr-1.5-develop-sync branch November 26, 2024 08:29
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