feat: upgrade on forking

.env.example

@@ -24,12 +24,9 @@ LOCAL_WITHDRAWAL_VAULT_ADDRESS=
 LOCAL_STAKING_VAULT_FACTORY_ADDRESS=
 LOCAL_STAKING_VAULT_BEACON_ADDRESS=
 
-# RPC URL for a separate, non Hardhat Network node (Anvil, Infura, Alchemy, etc.)
-MAINNET_RPC_URL=http://localhost:8545
-
-# RPC URL for Hardhat Network forking, required for running tests on mainnet fork with tracing (Infura, Alchemy, etc.)
+# RPC URL for Hardhat Network forking, required for running tests on fork with tracing (Infura, Alchemy, etc.)
 # https://hardhat.org/hardhat-network/docs/guides/forking-other-networks#forking-other-networks
-FORK_RPC_URL=https://eth.drpc.org
+RPC_URL=https://eth.drpc.org
 
 # https://docs.lido.fi/deployed-contracts
 MAINNET_LOCATOR_ADDRESS=0xC1d0b3DE6792Bf6b4b37EccdcC24e45978Cfd2Eb

.github/workflows/tests-integration-mainnet.yml

@@ -1,12 +1,7 @@
-name: Integration Tests
+name: Integration Tests On Upgrade
+# For local testing of this scenario use ./scripts/dao-upgrade-and-test-on-fork.sh
 
-on: workflow_dispatch
-
-# TODO: uncomment
-#on:
-#  push:
-#  schedule:
-#    - cron: "0 10 */2 * *"
+on: [push]
 
 jobs:
   test_hardhat_integration_fork:
@@ -18,9 +13,10 @@ jobs:
       hardhat-node:
         image: ghcr.io/lidofinance/hardhat-node:2.24.0
         ports:
-          - 8545:8545
+          - 8555:8545
         env:
           ETH_RPC_URL: "${{ secrets.ETH_RPC_URL }}"
+          DONT_SET_CHAIN_ID: true
           HARDFORK: "prague"
 
     steps:
@@ -29,10 +25,33 @@ jobs:
       - name: Common setup
         uses: ./.github/workflows/setup
 
-      - name: Set env
-        run: cp .env.example .env
+      - name: Prepare network state file
+        run: cp deployed-mainnet.json deployed-mainnet-upgrade.json
+
+      - name: Deploy upgrade
+        run: yarn upgrade:deploy
+        env:
+          RPC_URL: http://localhost:8555
+          DEPLOYER: "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266" # first acc of default mnemonic "test test ..."
+          GAS_PRIORITY_FEE: 1
+          GAS_MAX_FEE: 100
+          NETWORK_STATE_FILE: deployed-mainnet-upgrade.json
+          UPGRADE_PARAMETERS_FILE: upgrade-parameters-mainnet.json
+
+      - name: Mock Aragon voting
+        run: yarn upgrade:mock-voting
+        env:
+          RPC_URL: http://localhost:8555
+          NETWORK_STATE_FILE: deployed-mainnet-upgrade.json
+
+      - name: Workaround for not updated state error when forking a fork
+        run: yarn hardhat --network local run --no-compile scripts/utils/mine.ts
+        env:
+          RPC_URL: http://localhost:8555
 
       - name: Run integration tests
-        run: yarn test:integration:fork:mainnet
+        run: yarn test:integration
         env:
           LOG_LEVEL: debug
+          RPC_URL: http://localhost:8555
+          NETWORK_STATE_FILE: deployed-mainnet-upgrade.json

.github/workflows/tests-integration-upgrade-template.yml

@@ -0,0 +1,24 @@
+name: Integration Test For Upgrade Template
+
+on: [push]
+
+jobs:
+  test_hardhat_integration_fork_template:
+    name: Hardhat / Upgrade Template
+    runs-on: ubuntu-latest
+    timeout-minutes: 120
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Common setup
+        uses: ./.github/workflows/setup
+
+      - name: Prepare network state file
+        run: cp deployed-mainnet.json deployed-mainnet-upgrade.json
+
+      - name: Run Upgrade Template Integration Tests
+        run: yarn test:integration:upgrade-template
+        env:
+          RPC_URL: "${{ secrets.ETH_RPC_URL }}"
+          UPGRADE_PARAMETERS_FILE: upgrade-parameters-mainnet.json

.gitignore

@@ -27,6 +27,7 @@ deployed-local.json
 deployed-local-devnet.json
 deployed-hardhat.json
 deployed-local-devnet.json
+deployed-mainnet-upgrade.json
 
 # MacOS
 .DS_Store

contracts/0.4.24/Lido.sol

@@ -15,6 +15,11 @@ import {StETHPermit} from "./StETHPermit.sol";
 
 import {Versioned} from "./utils/Versioned.sol";
 
+
+interface IBurnerMigration {
+    function migrate(address _oldBurner) external;
+}
+
 interface IStakingRouter {
     function deposit(uint256 _depositsCount, uint256 _stakingModuleId, bytes _depositCalldata) external payable;
 
@@ -29,10 +34,7 @@ interface IStakingRouter {
 
     function getWithdrawalCredentials() external view returns (bytes32);
 
-    function getStakingFeeAggregateDistributionE4Precision()
-        external
-        view
-        returns (uint16 modulesFee, uint16 treasuryFee);
+    function getStakingFeeAggregateDistributionE4Precision() external view returns (uint16 modulesFee, uint16 treasuryFee);
 }
 
 interface IWithdrawalQueue {
@@ -210,31 +212,45 @@ contract Lido is Versioned, StETHPermit, AragonApp {
         emit LidoLocatorSet(_lidoLocator);
         _initializeEIP712StETH(_eip712StETH);
 
-        // set infinite allowance for burner from withdrawal queue
-        // to burn finalized requests' shares
-        _approve(ILidoLocator(_lidoLocator).withdrawalQueue(), ILidoLocator(_lidoLocator).burner(), INFINITE_ALLOWANCE);
+        _setContractVersion(3);
 
-        _initialize_v3();
+        _approve(getLidoLocator().withdrawalQueue(), getLidoLocator().burner(), INFINITE_ALLOWANCE);
         initialized();
     }
 
     /**
      * @notice A function to finalize upgrade to v3 (from v2). Can be called only once
      *
      * For more details see https://github.com/lidofinance/lido-improvement-proposals/blob/develop/LIPS/lip-10.md
+     * @param _oldBurner The address of the old Burner contract to migrate from
+     * @param _contractsWithBurnerAllowances Contracts that have allowances for the old burner to be migrated
      */
-    function finalizeUpgrade_v3() external {
+    function finalizeUpgrade_v3(address _oldBurner, address[] _contractsWithBurnerAllowances) external {
         require(hasInitialized(), "NOT_INITIALIZED");
         _checkContractVersion(2);
+        require(_oldBurner != address(0), "OLD_BURNER_ADDRESS_ZERO");
+        address burner = getLidoLocator().burner();
+        require(_oldBurner != burner, "OLD_BURNER_SAME_AS_NEW");
 
-        _initialize_v3();
-    }
-
-    /**
-     * initializer for the Lido version "3"
-     */
-    function _initialize_v3() internal {
         _setContractVersion(3);
+
+        // migrate burner stETH balance
+        uint256 oldBurnerShares = _sharesOf(_oldBurner);
+        if (oldBurnerShares > 0) {
+            uint256 oldBurnerBalance = getPooledEthByShares(oldBurnerShares);
+            _transferShares(_oldBurner, burner, oldBurnerShares);
+            _emitTransferEvents(_oldBurner, burner, oldBurnerBalance, oldBurnerShares);
+        }
+
+        // initialize new burner with state from the old burner
+        IBurnerMigration(burner).migrate(_oldBurner);
+
+        // migrating allowances
+        for (uint256 i = 0; i < _contractsWithBurnerAllowances.length; i++) {
+            uint256 oldAllowance = allowance(_contractsWithBurnerAllowances[i], _oldBurner);
+            _approve(_contractsWithBurnerAllowances[i], _oldBurner, 0);
+            _approve(_contractsWithBurnerAllowances[i], burner, oldAllowance);
+        }
     }
 
     /**

contracts/0.4.24/StETH.sol

@@ -193,7 +193,7 @@ contract StETH is IERC20, Pausable {
      *
      * @dev This value changes when `approve` or `transferFrom` is called.
      */
-    function allowance(address _owner, address _spender) external view returns (uint256) {
+    function allowance(address _owner, address _spender) public view returns (uint256) {
         return allowances[_owner][_spender];
     }
 

contracts/0.4.24/template/LidoTemplate.sol

@@ -1,32 +1,34 @@
-// SPDX-FileCopyrightText: 2020 Lido <[email protected]>
+// SPDX-FileCopyrightText: 2025 Lido <[email protected]>
 
 // SPDX-License-Identifier: GPL-3.0
 
 pragma solidity 0.4.24;
 
-import "@aragon/os/contracts/factory/APMRegistryFactory.sol";
-import "@aragon/os/contracts/acl/ACL.sol";
-import "@aragon/os/contracts/apm/Repo.sol";
-import "@aragon/os/contracts/apm/APMRegistry.sol";
-import "@aragon/os/contracts/ens/ENSSubdomainRegistrar.sol";
-import "@aragon/os/contracts/kernel/Kernel.sol";
-import "@aragon/os/contracts/lib/ens/ENS.sol";
-import "@aragon/os/contracts/lib/ens/PublicResolver.sol";
-import "@aragon/os/contracts/factory/DAOFactory.sol";
-import "@aragon/os/contracts/common/IsContract.sol";
+import {APMRegistryFactory} from "@aragon/os/contracts/factory/APMRegistryFactory.sol";
+import {ACL} from "@aragon/os/contracts/acl/ACL.sol";
+import {Repo} from "@aragon/os/contracts/apm/Repo.sol";
+import {APMRegistry} from "@aragon/os/contracts/apm/APMRegistry.sol";
+import {ENSSubdomainRegistrar} from "@aragon/os/contracts/ens/ENSSubdomainRegistrar.sol";
+import {Kernel} from "@aragon/os/contracts/kernel/Kernel.sol";
+import {ENS} from "@aragon/os/contracts/lib/ens/ENS.sol";
+import {PublicResolver} from "@aragon/os/contracts/lib/ens/PublicResolver.sol";
+import {DAOFactory} from "@aragon/os/contracts/factory/DAOFactory.sol";
+import {IsContract} from "@aragon/os/contracts/common/IsContract.sol";
+import {MiniMeToken, MiniMeTokenFactory} from "@aragon/minime/contracts/MiniMeToken.sol";
+import {EVMScriptRegistry } from "@aragon/os/contracts/evmscript/EVMScriptRegistry.sol";
 
-import "@aragon/apps-agent/contracts/Agent.sol";
-import "@aragon/apps-vault/contracts/Vault.sol";
 
-import "@aragon/apps-lido/apps/voting/contracts/Voting.sol";
+import {Agent} from "@aragon/apps-agent/contracts/Agent.sol";
+import {Vault} from "@aragon/apps-vault/contracts/Vault.sol";
 
-import "@aragon/apps-finance/contracts/Finance.sol";
-import "@aragon/apps-lido/apps/token-manager/contracts/TokenManager.sol";
+import {Voting} from "@aragon/apps-lido/apps/voting/contracts/Voting.sol";
+import {Finance} from "@aragon/apps-finance/contracts/Finance.sol";
+import {TokenManager} from "@aragon/apps-lido/apps/token-manager/contracts/TokenManager.sol";
 
-import "@aragon/id/contracts/IFIFSResolvingRegistrar.sol";
+import {IFIFSResolvingRegistrar} from "@aragon/id/contracts/IFIFSResolvingRegistrar.sol";
 
-import "../Lido.sol";
-import "../nos/NodeOperatorsRegistry.sol";
+import {Lido} from "../Lido.sol";
+import {NodeOperatorsRegistry} from "../nos/NodeOperatorsRegistry.sol";
 
 contract LidoTemplate is IsContract {
     // Configuration errors
@@ -119,7 +121,7 @@ contract LidoTemplate is IsContract {
     APMRegistryFactory private apmRegistryFactory;
 
     DeployState private deployState;
-    APMRepos private apmRepos;
+    APMRepos public apmRepos;
 
     event TmplAPMDeployed(address apm);
     event TmplReposCreated();

contracts/0.8.25/interfaces/ILido.sol

@@ -6,8 +6,11 @@ pragma solidity 0.8.25;
 
 import {IERC20} from "@openzeppelin/contracts-v5.2/token/ERC20/IERC20.sol";
 import {IERC20Permit} from "@openzeppelin/contracts-v5.2/token/ERC20/extensions/IERC20Permit.sol";
+import {IVersioned} from "contracts/common/interfaces/IVersioned.sol";
+
+interface ILido is IERC20, IERC20Permit, IVersioned {
+    function sharesOf(address) external view returns (uint256);
 
-interface ILido is IERC20, IERC20Permit {
     function getSharesByPooledEth(uint256) external view returns (uint256);
 
     function getPooledEthByShares(uint256) external view returns (uint256);

contracts/0.8.25/interfaces/IOracleReportSanityChecker.sol

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2024 Lido <[email protected]>
+// SPDX-FileCopyrightText: 2025 Lido <[email protected]>
 // SPDX-License-Identifier: GPL-3.0
 
 // See contracts/COMPILERS.md

contracts/0.8.9/Burner.sol

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2023 Lido <[email protected]>
+// SPDX-FileCopyrightText: 2025 Lido <[email protected]>
 // SPDX-License-Identifier: GPL-3.0
 
 /* See contracts/COMPILERS.md */
@@ -58,12 +58,14 @@ contract Burner is IBurner, AccessControlEnumerable {
     using SafeERC20 for IERC20;
 
     error AppAuthFailed();
+    error MigrationNotAllowedOrAlreadyMigrated();
     error DirectETHTransfer();
     error ZeroRecoveryAmount();
     error StETHRecoveryWrongFunc();
     error ZeroBurnAmount();
     error BurnAmountExceedsActual(uint256 requestedAmount, uint256 actualAmount);
     error ZeroAddress(string field);
+    error OnlyLidoCanMigrate();
 
     bytes32 public constant REQUEST_BURN_MY_STETH_ROLE = keccak256("REQUEST_BURN_MY_STETH_ROLE");
     bytes32 public constant REQUEST_BURN_SHARES_ROLE = keccak256("REQUEST_BURN_SHARES_ROLE");
@@ -74,6 +76,8 @@ contract Burner is IBurner, AccessControlEnumerable {
     uint256 private totalCoverSharesBurnt;
     uint256 private totalNonCoverSharesBurnt;
 
+    bool public isMigrationAllowed;
+
     ILidoLocator public immutable LOCATOR;
     ILido public immutable LIDO;
 
@@ -116,16 +120,9 @@ contract Burner is IBurner, AccessControlEnumerable {
      * @param _admin the Lido DAO Aragon agent contract address
      * @param _locator the Lido locator address
      * @param _stETH stETH token address
-     * @param _totalCoverSharesBurnt Shares burnt counter init value (cover case)
-     * @param _totalNonCoverSharesBurnt Shares burnt counter init value (non-cover case)
+     * @param _isMigrationAllowed whether migration is allowed initially
      */
-    constructor(
-        address _admin,
-        address _locator,
-        address _stETH,
-        uint256 _totalCoverSharesBurnt,
-        uint256 _totalNonCoverSharesBurnt
-    ) {
+    constructor(address _admin, address _locator, address _stETH, bool _isMigrationAllowed) {
         if (_admin == address(0)) revert ZeroAddress("_admin");
         if (_locator == address(0)) revert ZeroAddress("_locator");
         if (_stETH == address(0)) revert ZeroAddress("_stETH");
@@ -135,9 +132,26 @@ contract Burner is IBurner, AccessControlEnumerable {
 
         LOCATOR = ILidoLocator(_locator);
         LIDO = ILido(_stETH);
+        isMigrationAllowed = _isMigrationAllowed;
+    }
 
-        totalCoverSharesBurnt = _totalCoverSharesBurnt;
-        totalNonCoverSharesBurnt = _totalNonCoverSharesBurnt;
+    /**
+     * @param _oldBurner The address of the old Burner contract
+     * @dev Can be called only by Lido contract. Migrates state from the old Burner. Can be run only once.
+     *      Cannot be run if migration is disabled upon deployment.
+     */
+    function migrate(address _oldBurner) external {
+        if (msg.sender != address(LIDO)) revert OnlyLidoCanMigrate();
+        if (_oldBurner == address(0)) revert ZeroAddress("_oldBurner");
+        if (!isMigrationAllowed) revert MigrationNotAllowedOrAlreadyMigrated();
+        isMigrationAllowed = false;
+
+        IBurner oldBurner = IBurner(_oldBurner);
+        totalCoverSharesBurnt = oldBurner.getCoverSharesBurnt();
+        totalNonCoverSharesBurnt = oldBurner.getNonCoverSharesBurnt();
+        (uint256 coverShares, uint256 nonCoverShares) = oldBurner.getSharesRequestedToBurn();
+        coverSharesBurnRequested = coverShares;
+        nonCoverSharesBurnRequested = nonCoverShares;
     }
 
     /**

contracts/0.8.9/sanity_checks/OracleReportSanityChecker.sol

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-3.0
 
 /* See contracts/COMPILERS.md */
 pragma solidity 0.8.9;
 
 import {SafeCast} from "@openzeppelin/contracts-v4.4/utils/math/SafeCast.sol";
 
@@ -170,20 +170,23 @@
     ISecondOpinionOracle public secondOpinionOracle;
 
     /// @param _lidoLocator address of the LidoLocator instance
+    /// @param _accountingOracle address of the AccountingOracle instance
+    /// @param _accounting address of the Accounting instance
     /// @param _admin address to grant DEFAULT_ADMIN_ROLE of the AccessControl contract
     /// @param _limitsList initial values to be set for the limits list
     constructor(
         address _lidoLocator,
+        address _accountingOracle,
+        address _accounting,
         address _admin,
         LimitsList memory _limitsList
     ) {
         if (_admin == address(0)) revert AdminCannotBeZero();
         LIDO_LOCATOR = ILidoLocator(_lidoLocator);
 
-        address accountingOracle = LIDO_LOCATOR.accountingOracle();
-        GENESIS_TIME = IBaseOracle(accountingOracle).GENESIS_TIME();
-        SECONDS_PER_SLOT = IBaseOracle(accountingOracle).SECONDS_PER_SLOT();
-        ACCOUNTING_ADDRESS = LIDO_LOCATOR.accounting();
+        GENESIS_TIME = IBaseOracle(_accountingOracle).GENESIS_TIME();
+        SECONDS_PER_SLOT = IBaseOracle(_accountingOracle).SECONDS_PER_SLOT();
+        ACCOUNTING_ADDRESS = _accounting;
 
         _updateLimits(_limitsList);