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

Feat/upgrade on forking #978

Open
wants to merge 28 commits into
base: feat/vaults
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
42c64b6
feat: untangle Sanity Checker and Locator deployment
arwer13 Mar 7, 2025
3673df4
feat: untangle Delegation deployment and Locator upgrade
arwer13 Mar 8, 2025
ac5e23b
fix: integration tests are now runnable on fork after upgrade
arwer13 Mar 9, 2025
969dcf5
fix: upgrade initialization in Lido and AccountingOracle
arwer13 Mar 10, 2025
9f00310
feat: initial version of upgrade on forking (with template)
arwer13 Mar 10, 2025
9a18b10
fix: ci scratch integration tests (provisioning)
arwer13 Mar 11, 2025
c3840d5
feat: restore CI integration test
arwer13 Mar 11, 2025
2fa8d9a
fix: ci mainnet integration test
arwer13 Mar 11, 2025
ba9417a
feat: move burner burnt shares initialization to upgrade template
arwer13 Mar 11, 2025
ef7c242
fix: burner scratch deployment
arwer13 Mar 11, 2025
43814a5
feat: add Burner migration with stETH in Lido.finalizeUpgrade_v3
arwer13 Mar 14, 2025
67c7d88
fix: add workaround to fix forking forks (e.g. hardhat forking hardhat)
arwer13 Mar 14, 2025
23877f5
fix: ci but setting no chainId on hardhat-node
arwer13 Mar 14, 2025
ed61031
Merge 'feat/vaults' (pdg) into 'feat/ugprade-on-forking'
arwer13 Mar 14, 2025
d1bf561
feat(upgrade): separate mocking aragon voting into yarn command
arwer13 Mar 14, 2025
be49584
fix(tests): update burner migration unit tests
arwer13 Mar 17, 2025
7554864
feat(upgrade): little improvements here and there
arwer13 Mar 17, 2025
a3685a5
fix(upgrade): remove failed unnecessary test and uncomment checks
arwer13 Mar 18, 2025
863a3c0
feat(scratch): save aragon app repo addresses on scratch deploy
arwer13 Mar 18, 2025
df4508d
feat(upgrade): more burner allowance migration + more template checks
arwer13 Mar 19, 2025
8f21f92
feat(upgrade): remove upgrade template from coverage report
arwer13 Mar 19, 2025
896bd55
Merge branch 'feat/vaults' into feat/upgrade-on-forking
arwer13 Mar 20, 2025
1167c03
feat(upgrade): remove WithdrawalVault upgrade from upgrade
arwer13 Mar 20, 2025
47fb019
chore: update .vscode settings.json cSpell.words
arwer13 Mar 20, 2025
57074e0
chore: update .gitignore to include vscode snippets
arwer13 Mar 24, 2025
bf8c893
Merge feat/vaults into feat/upgrade-on-forking
arwer13 Mar 26, 2025
1d0144a
fix: a few integration tests on forking update
arwer13 Mar 26, 2025
d1a589c
Merge branch 'feat/vaults' into feat/upgrade-on-forking
arwer13 Mar 26, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: ci mainnet integration test
arwer13 committed Mar 11, 2025
commit 2fa8d9ad2dd9283465bfd816eb0ec4babe6f22f1
2 changes: 2 additions & 0 deletions .github/workflows/tests-integration-mainnet.yml
Original file line number Diff line number Diff line change
@@ -37,6 +37,8 @@ jobs:

- name: Finalize scratch deployment
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

Unchanged files with check annotations Beta

// 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
event UpgradeFinished();
// Old upgraded non-proxy contracts
IBurner public constant _oldBurner = IBurner(0xD15a672319Cf0352560eE76d9e89eAB0889046D3);

Check warning on line 101 in contracts/0.8.25/utils/UpgradeTemplateV3.sol

GitHub Actions / Solhint

Constant name must be in capitalized SNAKE_CASE
IOracleReportSanityChecker public constant _oldOracleReportSanityChecker = IOracleReportSanityChecker(0x6232397ebac4f5772e53285B26c47914E9461E75);

Check warning on line 102 in contracts/0.8.25/utils/UpgradeTemplateV3.sol

GitHub Actions / Solhint

Constant name must be in capitalized SNAKE_CASE
// New proxy contracts
address public constant _accounting = 0x9015957A2210BB8B10e27d8BBEEF8d9498f123eF;

Check warning on line 105 in contracts/0.8.25/utils/UpgradeTemplateV3.sol

GitHub Actions / Solhint

Constant name must be in capitalized SNAKE_CASE
IVaultHub public constant _vaultHub = IVaultHub(0x9C6c49E1a5108eC5A2111c0b9B62624100d11e3a);

Check warning on line 106 in contracts/0.8.25/utils/UpgradeTemplateV3.sol

GitHub Actions / Solhint

Constant name must be in capitalized SNAKE_CASE
// New non-proxy contracts
IBurner public constant _burner = IBurner(0x897945A56464616a525C9e5F11a8D400a72a8f3A);

Check warning on line 109 in contracts/0.8.25/utils/UpgradeTemplateV3.sol

GitHub Actions / Solhint

Constant name must be in capitalized SNAKE_CASE
IOracleReportSanityChecker public constant _oracleReportSanityChecker = IOracleReportSanityChecker(0x633a7eB9b8912b22f3616013F3153de687F96074);
// Existing proxies and contracts
_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

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