Merge 'feat/vaults' (pdg) into 'feat/ugprade-on-forking'

lidofinance · arwer13 · Mar 7, 2025 · Mar 8, 2025 · Mar 9, 2025 · Mar 10, 2025
commit ed610319abbd06b68eccd3df0f365cdd57078d94
@@ -110,7 +110,6 @@ async function getMainnetForkNetworkConfig(): Promise<ProtocolNetworkConfig> {
   return new ProtocolNetworkConfig(getPrefixedEnv("MAINNET", defaultEnv), defaults, "mainnet-fork");
 }
 
-
 async function getForkingNetworkConfig(): Promise<ProtocolNetworkConfig> {
   const state = readNetworkState();
 

@@ -229,6 +229,15 @@ export async function main() {
     oracleReportSanityCheckerArgs,
   );
 
+  // Deploy PredepositGuarantee
+  const predepositGuarantee = await deployBehindOssifiableProxy(
+    Sk.predepositGuarantee,
+    "PredepositGuarantee",
+    proxyContractsOwner,
+    deployer,
+    [pdgDeployParams.gIndex, pdgDeployParams.gIndexAfterChange, pdgDeployParams.changeSlot],
+  );
+
   // Update LidoLocator with valid implementation
   const locatorConfig: string[] = [
     accountingOracle.address,

@@ -25,6 +25,7 @@ export async function main() {
     { name: "OracleReportSanityChecker", address: state.oracleReportSanityChecker.address },
     { name: "VaultHub", address: state.vaultHub.proxy.address },
     { name: "WithdrawalVault", address: state.withdrawalVault.proxy.address },
+    { name: "PredepositGuarantee", address: state.predepositGuarantee.proxy.address },
   ];
 
   for (const contract of ozAdminTransfers) {

@@ -22,6 +22,7 @@ export async function main() {
   const vaultHubParams = parameters[Sk.vaultHub].deployParameters;
   const depositContract = state.chainSpec.depositContractAddress;
   const wethContract = parameters["delegation"].deployParameters.wethContract;
+  const pdgDeployParams = parameters[Sk.predepositGuarantee].deployParameters;
 
   // TODO: maybe take the parameters from current sanity checker
   const sanityCheckerParams = parameters[Sk.oracleReportSanityChecker].deployParameters;
@@ -44,12 +45,21 @@ export async function main() {
 
   // Deploy VaultHub
   const vaultHub = await deployBehindOssifiableProxy(Sk.vaultHub, "VaultHub", proxyContractsOwner, deployer, [
+    locatorAddress,
     lidoAddress,
-    accounting.address,
     vaultHubParams.connectedVaultsLimit,
     vaultHubParams.relativeShareLimitBP,
   ]);
 
+  // Deploy PredepositGuarantee
+  const predepositGuarantee = await deployBehindOssifiableProxy(
+    Sk.predepositGuarantee,
+    "PredepositGuarantee",
+    proxyContractsOwner,
+    deployer,
+    [pdgDeployParams.gIndex, pdgDeployParams.gIndexAfterChange, pdgDeployParams.changeSlot],
+  );
+
   // Deploy WithdrawalVault new implementation
   await deployImplementation(Sk.withdrawalVault, "WithdrawalVault", deployer, [lidoAddress, treasuryAddress]);
 
@@ -115,6 +125,7 @@ export async function main() {
     await locator.withdrawalVault(),
     await locator.oracleDaemonConfig(),
     accounting.address,
+    predepositGuarantee.address,
     wstethAddress,
     vaultHub.address,
   ];
@@ -123,6 +134,7 @@ export async function main() {
   // Deploy StakingVault implementation contract
   const stakingVaultImpl = await deployWithoutProxy(Sk.stakingVaultImpl, "StakingVault", deployer, [
     vaultHub.address,
+    predepositGuarantee.address,
     depositContract,
   ]);
   const stakingVaultImplAddress = await stakingVaultImpl.getAddress();
@@ -143,9 +155,9 @@ export async function main() {
   const beaconAddress = await beacon.getAddress();
 
   // Deploy VaultFactory contract
-  const factory = await deployWithoutProxy(Sk.stakingVaultFactory, "VaultFactory", deployer, [
+  const vaultFactory = await deployWithoutProxy(Sk.stakingVaultFactory, "VaultFactory", deployer, [
     beaconAddress,
     delegationAddress,
   ]);
-  console.log("Factory address", await factory.getAddress());
+  console.log("VaultFactory address", await vaultFactory.getAddress());
 }
@@ -1,7 +1,7 @@
 import { keccak256 } from "ethers";
 import { ethers } from "hardhat";
 
-import { Burner, VaultHub } from "typechain-types";
+import { Burner, PredepositGuarantee, VaultHub } from "typechain-types";
 
 import { log } from "lib";
 import { loadContract } from "lib/contract";
@@ -20,6 +20,7 @@ export async function main(): Promise<void> {
   const stakingVaultBeaconAddress = state[Sk.stakingVaultBeacon].address;
   const nodeOperatorsRegistryAddress = state[Sk.appNodeOperatorsRegistry].proxy.address;
   const simpleDvtAddress = state[Sk.appSimpleDvt].proxy.address;
+  const predepositGuaranteeAddress = state[Sk.predepositGuarantee].proxy.address;
 
   // Deploy BeaconProxy to get bytecode and add it to whitelist
   const vaultBeaconProxy = await ethers.deployContract("BeaconProxy", [stakingVaultBeaconAddress, "0x"]);
@@ -67,4 +68,14 @@ export async function main(): Promise<void> {
   await makeTx(burner, "grantRole", [requestBurnSharesRole, simpleDvtAddress], { from: deployer });
   await makeTx(burner, "grantRole", [requestBurnSharesRole, accountingAddress], { from: deployer });
   // NB: admin role is kept on deployer to transfer it to the upgrade template on the next steps
+
+  //
+  // PredepositGuarantee
+  //
+
+  const predepositGuarantee = await loadContract<PredepositGuarantee>(
+    "PredepositGuarantee",
+    predepositGuaranteeAddress,
+  );
+  await makeTx(predepositGuarantee, "initialize", [agentAddress], { from: deployer });
 }
diff --git a/scripts/upgrade/upgrade-parameters.json b/scripts/upgrade/upgrade-parameters.json
@@ -27,6 +27,13 @@
       "clBalanceOraclesErrorUpperBPLimit": 50
     }
   },
+  "predepositGuarantee": {
+    "deployParameters": {
+      "gIndex": "0x0000000000000000000000000000000000000000000000000096000000000028",
+      "gIndexAfterChange": "0x0000000000000000000000000000000000000000000000000096000000000028",
+      "changeSlot": 0
+    }
+  },
   "delegation": {
     "deployParameters": {
       "wethContract": "0x94373a4919B3240D86eA41593D5eBa789FEF3848"

@@ -88,8 +88,8 @@ describe("VaultFactory.sol", () => {
 
     // Accounting
     vaultHubImpl = await ethers.deployContract("VaultHub", [
+      locator,
       steth,
-      ZeroAddress,
       VAULTS_CONNECTED_VAULTS_LIMIT,
       VAULTS_RELATIVE_SHARE_LIMIT_BP,
     ]);

diff --git a/test/0.8.25/vaults/vaulthub/vaulthub.pausable.test.ts b/test/0.8.25/vaults/vaulthub/vaulthub.pausable.test.ts
@@ -29,8 +29,8 @@ describe("VaultHub.sol:pausableUntil", () => {
     steth = await ethers.deployContract("StETH__HarnessForVaultHub", [user], { value: ether("1.0") });
 
     const vaultHubImpl = await ethers.deployContract("VaultHub", [
+      locator,
       steth,
-      ZeroAddress,
       VAULTS_CONNECTED_VAULTS_LIMIT,
       VAULTS_RELATIVE_SHARE_LIMIT_BP,
     ]);

@@ -30,9 +30,6 @@ import {
 import { bailOnFailure, Snapshot } from "test/suite";
 import { CURATED_MODULE_ID, MAX_DEPOSIT, ONE_DAY, SIMPLE_DVT_MODULE_ID, ZERO_HASH } from "test/suite/constants";
 
-const PUBKEY_LENGTH = 48n;
-const SIGNATURE_LENGTH = 96n;
-
 const VALIDATORS_PER_VAULT = 2n;
 const VALIDATOR_DEPOSIT_SIZE = ether("32");
 const VAULT_DEPOSIT = VALIDATOR_DEPOSIT_SIZE * VALIDATORS_PER_VAULT;

diff --git a/contracts/0.4.24/lib/StakeLimitUtils.sol b/contracts/0.4.24/lib/StakeLimitUtils.sol
 // SPDX-License-Identifier: GPL-3.0

 /* See contracts/COMPILERS.md */
 pragma solidity 0.4.24;

 import {UnstructuredStorage} from "@aragon/os/contracts/common/UnstructuredStorage.sol";

diff --git a/contracts/0.4.24/oracle/LegacyOracle.sol b/contracts/0.4.24/oracle/LegacyOracle.sol
 /* See contracts/COMPILERS.md */
 pragma solidity 0.4.24;

 import "@aragon/os/contracts/apps/AragonApp.sol";

 import "../../common/interfaces/ILidoLocator.sol";

 import "../utils/Versioned.sol";


 interface IAccountingOracle {
diff --git a/contracts/0.4.24/utils/Versioned.sol b/contracts/0.4.24/utils/Versioned.sol
 // SPDX-License-Identifier: GPL-3.0
 pragma solidity 0.4.24;

 import "@aragon/os/contracts/common/UnstructuredStorage.sol";

 /**
 * @title Adapted code of /contracts/0.8.9/utils/Versioned.sol
diff --git a/contracts/0.8.25/utils/UpgradeTemplateV3.sol b/contracts/0.8.25/utils/UpgradeTemplateV3.sol
    }

    // Old upgraded non-proxy contracts
    IBurner public immutable _oldBurner;
    IOracleReportSanityChecker public immutable _oldOracleReportSanityChecker;

    // New proxy contracts
    IAccounting public immutable _accounting;
    IVaultHub public immutable _vaultHub;

    // New non-proxy contracts
    IBurner public immutable _burner;
    IOracleReportSanityChecker public immutable _oracleReportSanityChecker;

    // Existing proxies and contracts
    //
    // Structured storage
    //
    uint256 private _upgradeBlockNumber = UPGRADE_NOT_STARTED;
    bool public _isUpgradeFinished;

    uint256 internal INITIAL_OLD_BURNER_STETH_BALANCE;
        _assertSingleAragonAppImplementation(_aragonAppLidoRepo, _lidoImplementation);
    }

    function _assertSingleAragonAppImplementation(IAragonAppRepo repo, address implementation) internal view {
        (, address actualImplementation, ) = repo.getLatest();
        if (actualImplementation != implementation) {
            revert IncorrectAragonAppImplementation(address(repo), implementation);
        }
    }

    function _assertFinalACL() internal view {
        address agent = _agent;
	// SPDX-License-Identifier: GPL-3.0

	/* See contracts/COMPILERS.md */
	pragma solidity 0.4.24;
Check warning on line 5 in contracts/0.4.24/lib/StakeLimitUtils.sol GitHub Actions / Solhint `Found more than One contract per file. 3 contracts found!`

	import {UnstructuredStorage} from "@aragon/os/contracts/common/UnstructuredStorage.sol";
	/* See contracts/COMPILERS.md */
	pragma solidity 0.4.24;

	import "@aragon/os/contracts/apps/AragonApp.sol";
Check warning on line 7 in contracts/0.4.24/oracle/LegacyOracle.sol GitHub Actions / Solhint `global import of path @aragon/os/contracts/apps/AragonApp.sol is not allowed. Specify names to import individually or bind all exports of the module into a name (import "path" as Name)`

	import "../../common/interfaces/ILidoLocator.sol";
Check warning on line 9 in contracts/0.4.24/oracle/LegacyOracle.sol GitHub Actions / Solhint `global import of path ../../common/interfaces/ILidoLocator.sol is not allowed. Specify names to import individually or bind all exports of the module into a name (import "path" as Name)`

	import "../utils/Versioned.sol";
Check warning on line 11 in contracts/0.4.24/oracle/LegacyOracle.sol GitHub Actions / Solhint `global import of path ../utils/Versioned.sol is not allowed. Specify names to import individually or bind all exports of the module into a name (import "path" as Name)`


	interface IAccountingOracle {
	// SPDX-License-Identifier: GPL-3.0
	pragma solidity 0.4.24;

	import "@aragon/os/contracts/common/UnstructuredStorage.sol";
Check warning on line 5 in contracts/0.4.24/utils/Versioned.sol GitHub Actions / Solhint `global import of path @aragon/os/contracts/common/UnstructuredStorage.sol is not allowed. Specify names to import individually or bind all exports of the module into a name (import "path" as Name)`

	/**
	* @title Adapted code of /contracts/0.8.9/utils/Versioned.sol
	}

	// Old upgraded non-proxy contracts
	IBurner public immutable _oldBurner;
Check warning on line 136 in contracts/0.8.25/utils/UpgradeTemplateV3.sol GitHub Actions / Solhint `Immutable variables name are set to be in capitalized SNAKE_CASE`
	IOracleReportSanityChecker public immutable _oldOracleReportSanityChecker;
Check warning on line 137 in contracts/0.8.25/utils/UpgradeTemplateV3.sol GitHub Actions / Solhint `Immutable variables name are set to be in capitalized SNAKE_CASE`

	// New proxy contracts
	IAccounting public immutable _accounting;
Check warning on line 140 in contracts/0.8.25/utils/UpgradeTemplateV3.sol GitHub Actions / Solhint `Immutable variables name are set to be in capitalized SNAKE_CASE`
	IVaultHub public immutable _vaultHub;
Check warning on line 141 in contracts/0.8.25/utils/UpgradeTemplateV3.sol GitHub Actions / Solhint `Immutable variables name are set to be in capitalized SNAKE_CASE`

	// New non-proxy contracts
	IBurner public immutable _burner;
Check warning on line 144 in contracts/0.8.25/utils/UpgradeTemplateV3.sol GitHub Actions / Solhint `Immutable variables name are set to be in capitalized SNAKE_CASE`
	IOracleReportSanityChecker public immutable _oracleReportSanityChecker;

	// Existing proxies and contracts
	//
	// Structured storage
	//
	uint256 private _upgradeBlockNumber = UPGRADE_NOT_STARTED;
Check warning Code scanning / Slither State variables that could be declared constant Warning UpgradeTemplateV3._upgradeBlockNumber should be constant
	bool public _isUpgradeFinished;

	uint256 internal INITIAL_OLD_BURNER_STETH_BALANCE;
	_assertSingleAragonAppImplementation(_aragonAppLidoRepo, _lidoImplementation);
	}

	function _assertSingleAragonAppImplementation(IAragonAppRepo repo, address implementation) internal view {
	(, address actualImplementation, ) = repo.getLatest();
	if (actualImplementation != implementation) {
	revert IncorrectAragonAppImplementation(address(repo), implementation);
	}
	}
Check warning Code scanning / Slither Unused return Medium UpgradeTemplateV3._assertSingleAragonAppImplementation(IAragonAppRepo,address) ignores return value by (None,actualImplementation,None) = repo.getLatest()

	function _assertFinalACL() internal view {
	address agent = _agent;