Skip to content

Commit bd864ed

Browse files
committed
Merge branch 'master' into feat/core-integrations
# Conflicts: # .github/actions/scripts_tests/action.yml # .github/workflows/normal_vote_ci.yml # tests/acceptance/test_accounting_oracle_negative.py # tests/regression/test_accounting.py # tests/regression/test_all_round_happy_path.py # utils/test/simple_dvt_helpers.py
2 parents a27355a + 3422cdf commit bd864ed

File tree

135 files changed

+34434
-926
lines changed

Some content is hidden

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

135 files changed

+34434
-926
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
.github @lidofinance/lido-dao-ops-team
1+
* @lidofinance/lido-dao-ops-team

.github/actions/core_tests/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ runs:
1313
# Tests from core repo
1414
- uses: actions/checkout@v4
1515
with:
16-
repository: lidofinance/lido-dao
16+
repository: lidofinance/core
1717
ref: master
1818
path: core
1919

.github/actions/scripts_tests/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ runs:
6666
shell: bash
6767
run: >
6868
poetry run
69-
brownie test --network mainnet-fork
69+
brownie test -ra --network mainnet-fork --durations=20
7070
env:
7171
WEB3_INFURA_PROJECT_ID: ${{ inputs.infura }}
7272
ETHERSCAN_TOKEN: ${{ inputs.etherscan }}
Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
name: build and push image
2+
3+
on:
4+
push:
5+
tags:
6+
- "*"
7+
8+
permissions:
9+
contents: read
10+
packages: write
11+
12+
jobs:
13+
build-and-push-arm64:
14+
runs-on: ubuntu-24.04-arm
15+
steps:
16+
- name: Checkout
17+
uses: actions/checkout@v4
18+
19+
- name: Login to ghcr.io
20+
uses: docker/login-action@v3
21+
with:
22+
registry: ghcr.io
23+
username: ${{ github.repository_owner }}
24+
password: ${{ secrets.GITHUB_TOKEN }}
25+
26+
- name: Build and push image
27+
uses: docker/[email protected]
28+
with:
29+
context: .
30+
platforms: linux/arm64
31+
push: true
32+
tags: ghcr.io/lidofinance/scripts:${{ github.ref_name }}-arm64
33+
34+
build-and-push-amd64:
35+
runs-on: ubuntu-24.04
36+
steps:
37+
- name: Checkout
38+
uses: actions/checkout@v4
39+
40+
- name: Login to ghcr.io
41+
uses: docker/login-action@v3
42+
with:
43+
registry: ghcr.io
44+
username: ${{ github.repository_owner }}
45+
password: ${{ secrets.GITHUB_TOKEN }}
46+
47+
- name: Build and push image
48+
uses: docker/[email protected]
49+
with:
50+
context: .
51+
platforms: linux/amd64
52+
push: true
53+
tags: ghcr.io/lidofinance/scripts:${{ github.ref_name }}-amd64
54+
55+
docker-manifest:
56+
runs-on: ubuntu-24.04
57+
needs: [build-and-push-arm64, build-and-push-amd64]
58+
steps:
59+
- name: Login to ghcr.io
60+
uses: docker/login-action@v3
61+
with:
62+
registry: ghcr.io
63+
username: ${{ github.repository_owner }}
64+
password: ${{ secrets.GITHUB_TOKEN }}
65+
66+
- name: Create and push manifest images
67+
uses: Noelware/docker-manifest-action@master
68+
with:
69+
inputs: ghcr.io/lidofinance/scripts:${{ github.ref_name }}
70+
images: ghcr.io/lidofinance/scripts:${{ github.ref_name }}-amd64,ghcr.io/lidofinance/scripts:${{ github.ref_name }}-arm64
71+
push: true
72+
73+
run-trivy:
74+
needs: docker-manifest
75+
runs-on: ubuntu-24.04
76+
steps:
77+
- name: Checkout
78+
uses: actions/checkout@v4
79+
80+
- name: Run Trivy vulnerability scanner
81+
uses: aquasecurity/[email protected]
82+
with:
83+
image-ref: 'ghcr.io/lidofinance/scripts:${{ github.ref_name }}'
84+
format: 'table'
85+
exit-code: '0'
86+
ignore-unfixed: true
87+
vuln-type: 'os,library'
88+
severity: 'CRITICAL,HIGH'

.github/workflows/large_vote_ci.yml

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,28 @@ jobs:
1515
run-tests-large:
1616
name: Brownie fork LARGE tests
1717
runs-on: [protocol-heavy-runners]
18-
timeout-minutes: 100
18+
timeout-minutes: 150
19+
20+
services:
21+
hardhat-node:
22+
image: ghcr.io/lidofinance/hardhat-node:2.22.19.2-shanghai
23+
ports:
24+
- 8545:8545
25+
env:
26+
ETH_RPC_URL: "https://mainnet.infura.io/v3/${{ secrets.WEB3_INFURA_PROJECT_ID }}"
27+
1928
steps:
29+
- name: Enabling swap
30+
run: |
31+
sudo df -h
32+
sudo swapon --show
33+
sudo swapoff -a
34+
sudo touch /swapfile
35+
sudo fallocate -l 32G /swapfile
36+
sudo chmod 600 /swapfile
37+
sudo mkswap /swapfile
38+
sudo swapon /swapfile
39+
sudo swapon --show
2040
- uses: actions/checkout@v3
2141
- name: Main action
2242
uses: ./.github/actions/brownie_fork_tests

.github/workflows/normal_vote_ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ jobs:
1515
run-tests:
1616
name: Run all tests on NORMAL runner
1717
runs-on: "ubuntu-latest"
18-
timeout-minutes: 120
18+
timeout-minutes: 100
19+
1920
services:
2021
hardhat-node:
21-
image: ghcr.io/lidofinance/hardhat-node:2.22.12
22+
image: ghcr.io/lidofinance/hardhat-node:2.22.19.2-shanghai
2223
ports:
2324
- 8545:8545
2425
env:
25-
ETH_RPC_URL: ${{ secrets.ETH_RPC_URL }}
26-
26+
ETH_RPC_URL: "https://mainnet.infura.io/v3/${{ secrets.WEB3_INFURA_PROJECT_ID }}"
2727
steps:
2828
- uses: actions/checkout@v4
2929

0 commit comments

Comments
 (0)