Skip to content

Commit 796b7d4

Browse files
rkolpakovrkolpakov
committed
chore: merge from develop
2 parents e54cd83 + 828f9a9 commit 796b7d4

File tree

254 files changed

+23759
-5670
lines changed

Some content is hidden

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

254 files changed

+23759
-5670
lines changed

‎.env.example‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,11 @@ MAINNET_STAKING_VAULT_FACTORY_ADDRESS=
5656
MAINNET_STAKING_VAULT_BEACON_ADDRESS=
5757
MAINNET_VALIDATOR_CONSOLIDATION_REQUESTS_ADDRESS=
5858

59+
HOODI_LOCATOR_ADDRESS=0xe2EF9536DAAAEBFf5b1c130957AB3E80056b06D8
60+
HOODI_AGENT_ADDRESS=0x0534aA41907c9631fae990960bCC72d75fA7cfeD
61+
HOODI_VOTING_ADDRESS=0x49B3512c44891bef83F8967d075121Bd1b07a01B
62+
HOODI_EASY_TRACK_EXECUTOR_ADDRESS=0x79a20FD0FA36453B2F45eAbab19bfef43575Ba9E
63+
5964
SEPOLIA_RPC_URL=
6065
HOODI_RPC_URL=
6166

‎.github/workflows/coverage.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
coverage:
10-
name: Hardhat
10+
name: Hardhat / Unit Tests
1111
runs-on: ubuntu-latest
1212
env:
1313
NODE_OPTIONS: --max_old_space_size=6400
@@ -31,8 +31,7 @@ jobs:
3131
with:
3232
path: ./coverage/cobertura-coverage.xml
3333
publish: true
34-
# TODO: restore to 95% before release
35-
threshold: 80
34+
threshold: 95
3635
diff: true
3736
diff-branch: master
3837
diff-storage: _core_coverage_reports

‎.github/workflows/linters.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,15 @@ jobs:
5858
- name: Run format check
5959
run: yarn format
6060

61-
validate-configs:
62-
name: Validate Configs
63-
runs-on: ubuntu-latest
61+
# validate-configs:
62+
# name: Validate Configs
63+
# runs-on: ubuntu-latest
6464

65-
steps:
66-
- uses: actions/checkout@v4
65+
# steps:
66+
# - uses: actions/checkout@v4
6767

68-
- name: Common setup
69-
uses: ./.github/workflows/setup
68+
# - name: Common setup
69+
# uses: ./.github/workflows/setup
7070

71-
- name: Validate configurations
72-
run: yarn validate:configs
71+
# - name: Validate configurations
72+
# run: yarn validate:configs

‎.github/workflows/tests-integration-hoodi.yml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Integration Tests
2+
3+
on: [push]
4+
5+
jobs:
6+
test_hardhat_integration_fork:
7+
name: Hardhat / Hoodi
8+
runs-on: ubuntu-latest
9+
timeout-minutes: 120
10+
env:
11+
NODE_OPTIONS: --max_old_space_size=7200
12+
SKIP_GAS_REPORT: true
13+
SKIP_CONTRACT_SIZE: true
14+
SKIP_INTERFACES_CHECK: true
15+
16+
steps:
17+
- uses: actions/checkout@v4
18+
19+
- name: Common setup
20+
uses: ./.github/workflows/setup
21+
22+
- name: Run integration tests
23+
run: yarn test:integration
24+
env:
25+
RPC_URL: "${{ secrets.HOODI_RPC_URL }}"
26+
NETWORK_STATE_FILE: deployed-hoodi.json

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

Lines changed: 3 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
name: Integration Tests On Upgrade
2-
# For local testing of this scenario use ./scripts/dao-upgrade-and-test-on-fork.sh
1+
name: Integration Tests
32

43
on: [push]
54

@@ -14,49 +13,14 @@ jobs:
1413
SKIP_CONTRACT_SIZE: true
1514
SKIP_INTERFACES_CHECK: true
1615

17-
services:
18-
hardhat-node:
19-
image: ghcr.io/lidofinance/hardhat-node:2.26.0
20-
ports:
21-
- 8555:8545
22-
env:
23-
ETH_RPC_URL: "${{ secrets.ETH_RPC_URL }}"
24-
DONT_SET_CHAIN_ID: true
25-
HARDFORK: "prague"
26-
2716
steps:
2817
- uses: actions/checkout@v4
2918

3019
- name: Common setup
3120
uses: ./.github/workflows/setup
3221

33-
- name: Prepare network state file
34-
run: cp deployed-mainnet.json deployed-mainnet-upgrade.json
35-
36-
- name: Deploy upgrade
37-
run: yarn upgrade:deploy
38-
env:
39-
RPC_URL: http://localhost:8555
40-
DEPLOYER: "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266" # first acc of default mnemonic "test test ..."
41-
GAS_PRIORITY_FEE: 1
42-
GAS_MAX_FEE: 100
43-
NETWORK_STATE_FILE: deployed-mainnet-upgrade.json
44-
GENESIS_TIME: 1606824023 # needed only for TW upgrade
45-
46-
- name: Mock Aragon voting
47-
run: yarn upgrade:mock-voting
48-
env:
49-
RPC_URL: http://localhost:8555
50-
NETWORK_STATE_FILE: deployed-mainnet-upgrade.json
51-
52-
- name: Workaround for not updated state error when forking a fork
53-
run: yarn hardhat --network local run --no-compile scripts/utils/mine.ts
54-
env:
55-
RPC_URL: http://localhost:8555
56-
5722
- name: Run integration tests
5823
run: yarn test:integration
5924
env:
60-
RPC_URL: http://localhost:8555
61-
LOG_LEVEL: debug
62-
NETWORK_STATE_FILE: deployed-mainnet-upgrade.json
25+
RPC_URL: "${{ secrets.ETH_RPC_URL }}"
26+
NETWORK_STATE_FILE: deployed-mainnet.json

‎.github/workflows/tests-integration-scratch.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Integration Tests
1+
name: Integration Tests Scratch
22

33
on: [push]
44

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

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎.github/workflows/verify-state.yml‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
name: Verify State
2+
3+
on:
4+
workflow_dispatch:
5+
push:
6+
branches:
7+
- "main"
8+
- "develop"
9+
schedule:
10+
- cron: "0 0 * * *" # runs every day at midnight UTC
11+
12+
jobs:
13+
run_state_mate_hoodi:
14+
name: Hoodi State
15+
runs-on: ubuntu-latest
16+
timeout-minutes: 120
17+
env:
18+
STATE_MATE_BRANCH: "main"
19+
HOODI_REMOTE_RPC_URL: "https://hoodi.drpc.org"
20+
21+
steps:
22+
- name: Checkout state-mate
23+
uses: actions/checkout@v4
24+
with:
25+
repository: lidofinance/state-mate
26+
ref: ${{ env.STATE_MATE_BRANCH }}
27+
28+
- name: Setup Node.js
29+
uses: actions/setup-node@v4
30+
with:
31+
node-version: "20"
32+
33+
- name: Enable Corepack
34+
run: corepack enable
35+
36+
- name: Install dependencies
37+
run: yarn install
38+
39+
- name: Run state-mate (V3 Hoodi Testnet)
40+
run: yarn start configs/lidov3/hoodi/lidov3-testnet.yaml
41+
42+
- name: Run state-mate (V3 Hoodi Easy Track)
43+
run: yarn start configs/lidov3/hoodi/lidov3-et-testnet.yml
44+
45+
run_state_mate_mainnet:
46+
name: Mainnet State
47+
runs-on: ubuntu-latest
48+
timeout-minutes: 120
49+
env:
50+
STATE_MATE_BRANCH: "main"
51+
MAINNET_REMOTE_RPC_URL: "https://eth.drpc.org"
52+
53+
steps:
54+
- name: Checkout state-mate
55+
uses: actions/checkout@v4
56+
with:
57+
repository: lidofinance/state-mate
58+
ref: ${{ env.STATE_MATE_BRANCH }}
59+
60+
- name: Setup Node.js
61+
uses: actions/setup-node@v4
62+
with:
63+
node-version: "20"
64+
65+
- name: Enable Corepack
66+
run: corepack enable
67+
68+
- name: Install dependencies
69+
run: yarn install
70+
71+
- name: Run state-mate (V3 Mainnet)
72+
run: yarn start configs/lidov3/mainnet/lidov3-core-post-vote.yaml
73+
74+
- name: Run state-mate (V3 Mainnet Easy Track)
75+
run: yarn start configs/lidov3/mainnet/lidov3-et-post-vote.yml

‎.solcover.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,5 @@ module.exports = {
1515
"testnet",
1616
"upgrade",
1717
],
18+
irMinimum: true,
1819
};

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ This is the most common method for running integration tests. It uses an instanc
341341
mainnet environment, allowing you to run integration tests with trace logging.
342342
343343
> [!NOTE]
344-
> Ensure that `FORK_RPC_URL` is set to Ethereum Mainnet RPC and `MAINNET_*` environment variables are set in the
344+
> Ensure that `RPC_URL` is set to Ethereum Mainnet RPC and `MAINNET_*` environment variables are set in the
345345
> `.env` file (refer to `.env.example` for guidance). Otherwise, the tests will run against the Scratch deployment.
346346
347347
```bash

0 commit comments

Comments
 (0)