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: update SR1.5 dev branch with latest changes from develop branch #216

Closed
wants to merge 283 commits into from

Conversation

tamtamchik
Copy link
Member

@tamtamchik tamtamchik commented Sep 24, 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

# Conflicts:
#	test/0.4.24/versioned.test.ts
# Conflicts:
#	.github/workflows/tests.yml
chore: update repovation branch
# Conflicts:
#	test/0.4.24/lib/stakeLimitUtils.test.ts
#	test/0.8.9/sanityChecks/baseOracleReportSanityChecker.test.ts
mollybs and others added 14 commits September 22, 2024 22:11
# Conflicts:
#	lib/deploy.ts
#	scripts/scratch/deployed-testnet-defaults.json
#	scripts/scratch/steps/0030-deploy-template-and-app-bases.ts
#	scripts/scratch/steps/0090-deploy-non-aragon-contracts.ts
#	test/0.4.24/contracts/NodeOperatorsRegistry__Harness.sol
#	test/0.4.24/nor/nor.aux.test.ts
#	test/0.4.24/nor/nor.initialize.upgrade.test.ts
#	test/0.4.24/nor/nor.management.flow.test.ts
#	test/0.4.24/nor/nor.rewards.penalties.flow.test.ts
#	test/0.4.24/nor/nor.signing.keys.test.ts
#	test/0.8.9/contracts/StakingModule__Mock.sol
#	test/0.8.9/contracts/StakingRouter__MockForDepositSecurityModule.sol
#	test/0.8.9/contracts/StakingRouter__MockForSanityChecker.sol
#	test/0.8.9/contracts/oracle/OracleReportSanityCheckerMocks.sol
#	test/0.8.9/depositSecurityModule.test.ts
#	test/0.8.9/oracle/accountingOracle.submitReport.test.ts
#	test/0.8.9/oracle/accountingOracle.submitReportExtraData.test.ts
#	test/0.8.9/oracle/baseOracle.accessControl.test.ts
#	test/0.8.9/sanityChecker/oracleReportSanityChecker.misc.test.ts
#	test/0.8.9/sanityChecker/oracleReportSanityChecker.negative-rebase.test.ts
#	test/0.8.9/stakingRouter/stakingRouter.misc.test.ts
#	test/0.8.9/stakingRouter/stakingRouter.module-management.test.ts
#	test/0.8.9/stakingRouter/stakingRouter.module-sync.test.ts
#	test/0.8.9/stakingRouter/stakingRouter.rewards.test.ts
#	test/0.8.9/stakingRouter/stakingRouter.status-control.test.ts
#	test/0.8.9/stakingRouter/stakingRouter.versioned.test.ts
#	test/common/minFirstAllocationStrategy.t.sol
#	test/deploy/dao.ts
Copy link

github-actions bot commented Sep 24, 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       +7       0  +100.00%
contracts/testnets/sepolia/SepoliaDepositAdapter.sol             +21     +21  +100.00%
TOTAL                                                           +111     +22  -0.57%

Results for commit: 15ce3a4

Minimum allowed coverage is 95%

♻️ This comment has been updated with latest results

@tamtamchik
Copy link
Member Author

@avsetsin @mkurayan JFYI, this PR aims to bring recent develop changes to the feat/sr-1.5 branch; if someone from your team is working on it, it might be helpful.

…velop-sync

# Conflicts:
#	test/0.8.9/oracle/hashConsensus.submitReport.test.ts
@tamtamchik tamtamchik added dependencies Pull requests that update a dependency files. refactoring Code improvement without changing functionality. labels Sep 25, 2024
@tamtamchik
Copy link
Member Author

Ported to lidofinance/lido-dao#858

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency files. refactoring Code improvement without changing functionality.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants