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

Open
wants to merge 8 commits into
base: feat/vaults
Choose a base branch
from
Open

feat: factory upgrade #901

wants to merge 8 commits into from

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                                        178      39  78.09%   383-389, 492-500, 627-664, 721-771, 921, 1020
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                   485       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                                   85      81  4.71%    114-481
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/Versioned.sol                              11      11  0.00%    26-55
contracts/0.8.25/vaults/BeaconChainDepositLogistics.sol           21       2  90.48%   57, 60
contracts/0.8.25/vaults/Dashboard.sol                             39       1  97.44%   256
contracts/0.8.25/vaults/Delegation.sol                            82      30  63.41%   204-309, 335-339
contracts/0.8.25/vaults/StakingVault.sol                          73       0  100.00%
contracts/0.8.25/vaults/VaultFactory.sol                          21       0  100.00%
contracts/0.8.25/vaults/VaultHub.sol                             151     108  28.48%   110-119, 143, 165, 171, 191-460
contracts/0.8.25/vaults/interfaces/IBeaconProxy.sol                0       0  100.00%
contracts/0.8.25/vaults/interfaces/IHubVault.sol                   0       0  100.00%
contracts/0.8.25/vaults/interfaces/IReportReceiver.sol             0       0  100.00%
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                        104       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                                   19       0  100.00%
contracts/0.8.9/OracleDaemonConfig.sol                            28       0  100.00%
contracts/0.8.9/StakingRouter.sol                                303       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                      171       1  99.42%   674
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      155       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                                                           3307     389  88.24%

Diff against master

Filename                                                       Stmts    Miss  Cover
-----------------------------------------------------------  -------  ------  --------
contracts/0.4.24/Lido.sol                                        -34     +39  -21.91%
contracts/0.4.24/nos/NodeOperatorsRegistry.sol                   -27       0  +100.00%
contracts/0.8.25/Accounting.sol                                  +85     +81  +4.71%
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/Versioned.sol                             +11     +11  +100.00%
contracts/0.8.25/vaults/BeaconChainDepositLogistics.sol          +21      +2  +90.48%
contracts/0.8.25/vaults/Dashboard.sol                            +39      +1  +97.44%
contracts/0.8.25/vaults/Delegation.sol                           +82     +30  +63.41%
contracts/0.8.25/vaults/StakingVault.sol                         +73       0  +100.00%
contracts/0.8.25/vaults/VaultFactory.sol                         +21       0  +100.00%
contracts/0.8.25/vaults/VaultHub.sol                            +151    +108  +28.48%
contracts/0.8.25/vaults/interfaces/IBeaconProxy.sol                0       0  +100.00%
contracts/0.8.25/vaults/interfaces/IHubVault.sol                   0       0  +100.00%
contracts/0.8.25/vaults/interfaces/IReportReceiver.sol             0       0  +100.00%
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/DepositSecurityModule.sol                        -24       0  +100.00%
contracts/0.8.9/LidoLocator.sol                                   +1       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      -77       0  +100.00%
TOTAL                                                           +291    +271  -7.85%

Results for commit: 8c6bfd4

Minimum allowed coverage is 95%

♻️ 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
@@ -84,6 +84,7 @@ contract StakingVault is IStakingVault, IBeaconProxy, BeaconChainDepositLogistic
IStakingVault.Report report;
uint128 locked;
int128 inOutDelta;
address factory;
Copy link
Member

Choose a reason for hiding this comment

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

Let's not check factory at all

contracts/0.8.25/vaults/VaultHub.sol
if (!$.vaultFactories[factory]) revert FactoryNotAllowed(factory);
{
address factory = IStakingVault(address (_vault)).factory();
if (!$.vaultFactories[factory]) revert FactoryNotAllowed(factory);
Copy link
Member

Choose a reason for hiding this comment

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

Let's store beacons here

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@folkyatina folkyatina folkyatina left review comments

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

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