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

Jump to bottom

feat: factory upgrade #901

Merged
merged 22 commits into from
Jan 21, 2025
Merged

feat: factory upgrade #901

merged 22 commits into from
Jan 21, 2025

Conversation

loga4
Copy link
Contributor

@loga4 loga4 commented Dec 17, 2024

  • split vault factory into 2 contracts: Beacon and VaultFactory
  • remove onlyBeacon modifier from initializer

@loga4 loga4 requested a review from a team as a code owner December 17, 2024 15:42
@github-actions GitHub Actions
Copy link

github-actions bot commented Dec 17, 2024 •
edited
Loading

badge

Hardhat Unit Tests Coverage Summary

Filename                                                       Stmts    Miss  Cover    Missing
-----------------------------------------------------------  -------  ------  -------  ------------------------------------------------------------------------------
contracts/0.4.24/Lido.sol                                        201       6  97.01%   741, 746, 787-789, 946-947
contracts/0.4.24/StETH.sol                                        79       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.25/Accounting.sol                                   90       5  94.44%   114-117, 343, 369
contracts/0.8.25/interfaces/ILido.sol                              0       0  100.00%
contracts/0.8.25/interfaces/IOracleReportSanityChecker.sol         0       0  100.00%
contracts/0.8.25/interfaces/IPostTokenRebaseReceiver.sol           0       0  100.00%
contracts/0.8.25/interfaces/IStakingRouter.sol                     0       0  100.00%
contracts/0.8.25/interfaces/IWithdrawalQueue.sol                   0       0  100.00%
contracts/0.8.25/utils/PausableUntilWithRoles.sol                  3       0  100.00%
contracts/0.8.25/vaults/BeaconChainDepositLogistics.sol           21       2  90.48%   57, 60
contracts/0.8.25/vaults/Dashboard.sol                             87       3  96.55%   165, 433, 474
contracts/0.8.25/vaults/Delegation.sol                            73       1  98.63%   338
contracts/0.8.25/vaults/StakingVault.sol                          65       0  100.00%
contracts/0.8.25/vaults/VaultFactory.sol                          25       0  100.00%
contracts/0.8.25/vaults/VaultHub.sol                             144     102  29.17%   111-124, 180-269, 284-350, 382-431, 443-451, 457-487, 501
contracts/0.8.25/vaults/interfaces/IStakingVault.sol               0       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                                        72       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                                   20       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      22  0.00%    88-172
contracts/0.8.9/lib/UnstructuredRefStorage.sol                     2       0  100.00%
contracts/0.8.9/oracle/AccountingOracle.sol                      190       2  98.95%   154-155
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      218      56  74.31%   195, 232, 273-324, 413-441, 495-507, 558-561, 569, 578, 586, 697, 702-747, 802
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/common/utils/PausableUntil.sol                          29       1  96.55%   33
contracts/testnets/sepolia/SepoliaDepositAdapter.sol              21      21  0.00%    49-100
TOTAL                                                           3538     316  91.07%

Diff against master

Filename                                                       Stmts    Miss  Cover
-----------------------------------------------------------  -------  ------  --------
contracts/0.4.24/Lido.sol                                        -11      +6  -2.99%
contracts/0.4.24/StETH.sol                                        +7       0  +100.00%
contracts/0.8.25/Accounting.sol                                  +90      +5  +94.44%
contracts/0.8.25/interfaces/ILido.sol                              0       0  +100.00%
contracts/0.8.25/interfaces/IOracleReportSanityChecker.sol         0       0  +100.00%
contracts/0.8.25/interfaces/IPostTokenRebaseReceiver.sol           0       0  +100.00%
contracts/0.8.25/interfaces/IStakingRouter.sol                     0       0  +100.00%
contracts/0.8.25/interfaces/IWithdrawalQueue.sol                   0       0  +100.00%
contracts/0.8.25/utils/PausableUntilWithRoles.sol                 +3       0  +100.00%
contracts/0.8.25/vaults/BeaconChainDepositLogistics.sol          +21      +2  +90.48%
contracts/0.8.25/vaults/Dashboard.sol                            +87      +3  +96.55%
contracts/0.8.25/vaults/Delegation.sol                           +73      +1  +98.63%
contracts/0.8.25/vaults/StakingVault.sol                         +65       0  +100.00%
contracts/0.8.25/vaults/VaultFactory.sol                         +25       0  +100.00%
contracts/0.8.25/vaults/VaultHub.sol                            +144    +102  +29.17%
contracts/0.8.25/vaults/interfaces/IStakingVault.sol               0       0  +100.00%
contracts/0.8.9/Burner.sol                                        +1       0  +100.00%
contracts/0.8.9/LidoLocator.sol                                   +2       0  +100.00%
contracts/0.8.9/lib/PositiveTokenRebaseLimiter.sol                 0     +22  -100.00%
contracts/0.8.9/sanity_checks/OracleReportSanityChecker.sol      -14     +56  -25.69%
contracts/common/utils/PausableUntil.sol                         +29      +1  +96.55%
TOTAL                                                           +522    +198  -5.02%

Results for commit: 3019051

Minimum allowed coverage is 90%

♻️ This comment has been updated with latest results

@tamtamchik tamtamchik changed the title Feat/factory upgrade feat: factory upgrade Dec 17, 2024
@tamtamchik
Merge branch 'feat-immutable-operator-in-vault' into feat/factory-upg…
8c6bfd4 
…rade

# Conflicts:
#	test/0.8.25/vaults/staking-vault/staking-vault.test.ts
@tamtamchik
Merge branch 'feat-immutable-operator-in-vault' into feat/factory-upg…
fac38f8 
…rade

# Conflicts:
#	test/0.8.25/vaults/dashboard/dashboard.test.ts
#	test/0.8.25/vaults/delegation/delegation.test.ts
#	test/0.8.25/vaults/staking-vault/staking-vault.test.ts
Base automatically changed from feat-immutable-operator-in-vault to feat/vaults December 24, 2024 15:53
folkyatina
folkyatina reviewed Jan 8, 2025
View reviewed changes
contracts/0.8.25/vaults/StakingVault.sol Outdated Show resolved Hide resolved
contracts/0.8.25/vaults/VaultHub.sol Outdated Show resolved Hide resolved
folkyatina
folkyatina approved these changes Jan 19, 2025
View reviewed changes
Copy link
Member

@folkyatina folkyatina left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@folkyatina folkyatina requested a review from tamtamchik January 19, 2025 11:15
tamtamchik
tamtamchik approved these changes Jan 20, 2025
View reviewed changes
Copy link
Member

@tamtamchik tamtamchik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Everything looks good. I have added some comments regarding the styling.

contracts/0.8.25/vaults/StakingVault.sol Outdated Show resolved Hide resolved
lib/protocol/networks.ts Show resolved Hide resolved
lib/proxy.ts Outdated Show resolved Hide resolved
test/integration/vaults-happy-path.integration.ts Outdated Show resolved Hide resolved
test/0.8.25/vaults/staking-vault/staking-vault.test.ts Show resolved Hide resolved
test/0.8.25/vaults/dashboard/dashboard.test.ts Show resolved Hide resolved
test/0.8.25/vaults/vaultFactory.test.ts Outdated Show resolved Hide resolved
test/0.8.25/vaults/vaultFactory.test.ts Outdated Show resolved Hide resolved
test/0.8.25/vaults/vaultFactory.test.ts Outdated Show resolved Hide resolved
test/0.8.25/vaults/vaultFactory.test.ts Outdated Show resolved Hide resolved
@loga4 loga4 requested a review from a team as a code owner January 21, 2025 21:55
@loga4 loga4 merged commit 292920a into feat/vaults Jan 21, 2025
9 checks passed
@loga4 loga4 deleted the feat/factory-upgrade branch January 21, 2025 22:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@folkyatina folkyatina folkyatina approved these changes

@tamtamchik tamtamchik tamtamchik approved these changes

Assignees
No one assigned
Labels
vaults
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@loga4 @tamtamchik @folkyatina