Skip to content

Commit 946ae4e

Browse files
iamnpiamnp
committed
Merge branch 'feat/next-vote' into v1_dg1_v2_dg2
2 parents 12c3bd3 + 9f77204 commit 946ae4e

26 files changed

+1336
-104
lines changed

‎.github/workflows/core_tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
uses: actions/checkout@v4
3535

3636
- name: Run init script
37-
run: docker exec -e CORE_BRANCH tests-runner bash -c 'make init'
37+
run: docker exec -e CORE_BRANCH tests-runner bash -c 'PYTHONPATH=$PWD make init'
3838
env:
3939
CORE_BRANCH: develop
4040

‎.github/workflows/dual_governance_regression.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ jobs:
147147
working-directory: scripts
148148

149149
- name: Prepare test environment with Brownie
150-
run: poetry run brownie run scripts/ci/prepare_environment --network mfh-1
150+
run: PYTHONPATH=$PWD poetry run brownie run scripts/ci/prepare_environment --network mfh-1
151151
working-directory: scripts
152152
env:
153153
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/large_vote_ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
vote: "large"
3737
rpc_url: ${{ secrets.ETH_RPC_URL }}
3838
etherscan: ${{ secrets.ETHERSCAN_TOKEN }}
39-
command: "make test-1/2"
39+
command: "PYTHONPATH=$PWD make test-1/2"
4040

4141
run-tests-large-2:
4242
name: Brownie fork LARGE tests 2
@@ -62,4 +62,4 @@ jobs:
6262
vote: "large"
6363
rpc_url: ${{ secrets.ETH_RPC_URL }}
6464
etherscan: ${{ secrets.ETHERSCAN_TOKEN }}
65-
command: "make test-2/2"
65+
command: "PYTHONPATH=$PWD make test-2/2"

‎.github/workflows/normal_vote_ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
vote: "normal"
3333
rpc_url: ${{ secrets.ETH_RPC_URL }}
3434
etherscan: ${{ secrets.ETHERSCAN_TOKEN }}
35-
command: "make test-1/2"
35+
command: "PYTHONPATH=$PWD make test-1/2"
3636

3737
run-tests-normal-2:
3838
name: Brownie fork NORMAL tests 2
@@ -56,4 +56,4 @@ jobs:
5656
vote: "normal"
5757
rpc_url: ${{ secrets.ETH_RPC_URL }}
5858
etherscan: ${{ secrets.ETHERSCAN_TOKEN }}
59-
command: "make test-2/2"
59+
command: "PYTHONPATH=$PWD make test-2/2"

‎brownie-config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ networks:
99
live:
1010
priority_fee: auto
1111

12-
autofetch_sources: true
12+
autofetch_sources: false
1313

1414
hypothesis:
1515
max_examples: 10

‎configs/config_mainnet.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -532,5 +532,6 @@
532532
PREDEPOSIT_GUARANTEE = "0xF4bF42c6D6A0E38825785048124DBAD6c9eaaac3"
533533
VAULTS_ADAPTER = "0xe2DE6d2DefF15588a71849c0429101F8ca9FB14D"
534534
GATE_SEAL_V3 = "0x881dAd714679A6FeaA636446A0499101375A365c"
535+
STAKING_VAULT_BEACON = "0x5FbE8cEf9CCc56ad245736D3C5bAf82ad54Ca789"
535536

536537
INITIAL_MAX_EXTERNAL_RATIO_BP = 300 # 3%

‎interfaces/IVaultsAdapter.json‎

Lines changed: 6 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -10,36 +10,13 @@
1010
"internalType": "bytes",
1111
"name": "_pubkeys",
1212
"type": "bytes"
13-
},
14-
{
15-
"internalType": "address",
16-
"name": "_feeRecipient",
17-
"type": "address"
1813
}
1914
],
2015
"name": "forceValidatorExit",
2116
"outputs": [],
2217
"stateMutability": "payable",
2318
"type": "function"
2419
},
25-
{
26-
"inputs": [
27-
{
28-
"internalType": "address",
29-
"name": "_vault",
30-
"type": "address"
31-
},
32-
{
33-
"internalType": "uint256",
34-
"name": "_liabilitySharesTarget",
35-
"type": "uint256"
36-
}
37-
],
38-
"name": "setLiabilitySharesTarget",
39-
"outputs": [],
40-
"stateMutability": "nonpayable",
41-
"type": "function"
42-
},
4320
{
4421
"inputs": [
4522
{
@@ -89,19 +66,19 @@
8966
"type": "address"
9067
},
9168
{
92-
"internalType": "uint16",
69+
"internalType": "uint256",
9370
"name": "_infrastructureFeeBP",
94-
"type": "uint16"
71+
"type": "uint256"
9572
},
9673
{
97-
"internalType": "uint16",
74+
"internalType": "uint256",
9875
"name": "_liquidityFeeBP",
99-
"type": "uint16"
76+
"type": "uint256"
10077
},
10178
{
102-
"internalType": "uint16",
79+
"internalType": "uint256",
10380
"name": "_reservationFeeBP",
104-
"type": "uint16"
81+
"type": "uint256"
10582
}
10683
],
10784
"name": "updateVaultFees",

‎interfaces/UpgradeableBeacon.json‎

Lines changed: 142 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,142 @@
1+
[
2+
{
3+
"inputs": [
4+
{
5+
"internalType": "address",
6+
"name": "implementation_",
7+
"type": "address"
8+
},
9+
{
10+
"internalType": "address",
11+
"name": "initialOwner",
12+
"type": "address"
13+
}
14+
],
15+
"stateMutability": "nonpayable",
16+
"type": "constructor"
17+
},
18+
{
19+
"inputs": [
20+
{
21+
"internalType": "address",
22+
"name": "implementation",
23+
"type": "address"
24+
}
25+
],
26+
"name": "BeaconInvalidImplementation",
27+
"type": "error"
28+
},
29+
{
30+
"inputs": [
31+
{
32+
"internalType": "address",
33+
"name": "owner",
34+
"type": "address"
35+
}
36+
],
37+
"name": "OwnableInvalidOwner",
38+
"type": "error"
39+
},
40+
{
41+
"inputs": [
42+
{
43+
"internalType": "address",
44+
"name": "account",
45+
"type": "address"
46+
}
47+
],
48+
"name": "OwnableUnauthorizedAccount",
49+
"type": "error"
50+
},
51+
{
52+
"anonymous": false,
53+
"inputs": [
54+
{
55+
"indexed": true,
56+
"internalType": "address",
57+
"name": "previousOwner",
58+
"type": "address"
59+
},
60+
{
61+
"indexed": true,
62+
"internalType": "address",
63+
"name": "newOwner",
64+
"type": "address"
65+
}
66+
],
67+
"name": "OwnershipTransferred",
68+
"type": "event"
69+
},
70+
{
71+
"anonymous": false,
72+
"inputs": [
73+
{
74+
"indexed": true,
75+
"internalType": "address",
76+
"name": "implementation",
77+
"type": "address"
78+
}
79+
],
80+
"name": "Upgraded",
81+
"type": "event"
82+
},
83+
{
84+
"inputs": [],
85+
"name": "implementation",
86+
"outputs": [
87+
{
88+
"internalType": "address",
89+
"name": "",
90+
"type": "address"
91+
}
92+
],
93+
"stateMutability": "view",
94+
"type": "function"
95+
},
96+
{
97+
"inputs": [],
98+
"name": "owner",
99+
"outputs": [
100+
{
101+
"internalType": "address",
102+
"name": "",
103+
"type": "address"
104+
}
105+
],
106+
"stateMutability": "view",
107+
"type": "function"
108+
},
109+
{
110+
"inputs": [],
111+
"name": "renounceOwnership",
112+
"outputs": [],
113+
"stateMutability": "nonpayable",
114+
"type": "function"
115+
},
116+
{
117+
"inputs": [
118+
{
119+
"internalType": "address",
120+
"name": "newOwner",
121+
"type": "address"
122+
}
123+
],
124+
"name": "transferOwnership",
125+
"outputs": [],
126+
"stateMutability": "nonpayable",
127+
"type": "function"
128+
},
129+
{
130+
"inputs": [
131+
{
132+
"internalType": "address",
133+
"name": "newImplementation",
134+
"type": "address"
135+
}
136+
],
137+
"name": "upgradeTo",
138+
"outputs": [],
139+
"stateMutability": "nonpayable",
140+
"type": "function"
141+
}
142+
]

0 commit comments

Comments
 (0)