Skip to content

Commit 4bf7742

Browse files
authored
Merge pull request #1382 from lidofinance/develop
[EPIC] Triggerable Withdrawals (develop ⇒ master)
2 parents a89fd49 + 39ba170 commit 4bf7742

File tree

154 files changed

+14118
-2910
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

154 files changed

+14118
-2910
lines changed

.env.example

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ LOCAL_ORACLE_DAEMON_CONFIG_ADDRESS=
1919
LOCAL_ORACLE_REPORT_SANITY_CHECKER_ADDRESS=
2020
LOCAL_SDVT_ADDRESS=
2121
LOCAL_STAKING_ROUTER_ADDRESS=
22+
LOCAL_VALIDATOR_EXIT_DELAY_VERIFIER_ADDRESS=
2223
LOCAL_VALIDATORS_EXIT_BUS_ORACLE_ADDRESS=
2324
LOCAL_WITHDRAWAL_QUEUE_ADDRESS=
2425
LOCAL_WITHDRAWAL_VAULT_ADDRESS=

.github/workflows/coverage.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ jobs:
99
coverage:
1010
name: Hardhat
1111
runs-on: ubuntu-latest
12+
env:
13+
NODE_OPTIONS: --max_old_space_size=6400
1214

1315
permissions:
1416
contents: write

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

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,42 @@ jobs:
1818
- 8545:8545
1919
env:
2020
ETH_RPC_URL: "${{ secrets.ETH_RPC_URL }}"
21+
HARDFORK: "prague"
2122

2223
steps:
2324
- uses: actions/checkout@v4
2425

2526
- name: Common setup
2627
uses: ./.github/workflows/setup
2728

28-
- name: Set env
29-
run: cp .env.example .env
29+
- name: Prepare network state file
30+
run: cp deployed-mainnet.json deployed-mainnet-upgrade.json
31+
32+
- name: Deploy upgrade
33+
run: yarn upgrade:deploy
34+
env:
35+
RPC_URL: http://localhost:8545
36+
# first acc of default mnemonic "test test ..."
37+
DEPLOYER: "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266"
38+
GAS_PRIORITY_FEE: 1
39+
GAS_MAX_FEE: 100
40+
NETWORK_STATE_FILE: deployed-mainnet-upgrade.json
41+
GENESIS_TIME: 1606824023
42+
43+
- name: Mock Aragon voting
44+
run: yarn upgrade:mock-voting
45+
env:
46+
RPC_URL: http://localhost:8545
47+
NETWORK_STATE_FILE: deployed-mainnet-upgrade.json
48+
49+
- name: Workaround for not updated state error when forking a fork
50+
run: yarn hardhat --network local run --no-compile scripts/utils/mine.ts
51+
env:
52+
RPC_URL: http://localhost:8545
3053

3154
- name: Run integration tests
3255
run: yarn test:integration:fork:mainnet
3356
env:
3457
LOG_LEVEL: debug
58+
RPC_URL: http://localhost:8545
59+
NETWORK_STATE_FILE: deployed-mainnet-upgrade.json

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
.idea/
22
.yarn/
33
.vscode/
4+
.cursor/
45

56
node_modules/
67
coverage/
@@ -26,6 +27,7 @@ accounts.json
2627
deployed-local.json
2728
deployed-hardhat.json
2829
deployed-local-devnet.json
30+
deployed-mainnet-upgrade.json
2931

3032
# MacOS
3133
.DS_Store

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Please refer to the [Lido Contributor Code of Conduct](/CODE_OF_CONDUCT.md).
6565

6666
## License
6767

68-
2024 Lido <[email protected]>
68+
2025 Lido <[email protected]>
6969

7070
This program is free software: you can redistribute it and/or modify
7171
it under the terms of the GNU General Public License as published by

contracts/0.4.24/nos/NodeOperatorsRegistry.sol

Lines changed: 221 additions & 293 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)