Skip to content

Commit 4b8fd47

Browse files
authored
Merge pull request #580 from lidofinance/feat/v3-phase-2
Omnibus 20.01.2026 (#198 - Lido V3 Phase 2, CSM Share → 7.5%, Grant role to CSM Performance Oracle report weekday offset contract)
2 parents dd3fc3f + 01f58e3 commit 4b8fd47

File tree

12 files changed

+1854
-42
lines changed

12 files changed

+1854
-42
lines changed

.github/workflows/core_tests.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,14 @@ on:
99
- "feat/rc2"
1010
- "feat/rc1"
1111
- "feat/next-vote"
12+
- "feat/v3-phase-2"
1213
schedule:
1314
- cron: "0 0 * * TUE"
1415

1516
jobs:
1617
run-tests:
1718
name: Core repo tests in docker
18-
runs-on: [voting-private-runners]
19+
runs-on: [ubuntu-latest]
1920
timeout-minutes: 120
2021

2122
services:
@@ -35,7 +36,7 @@ jobs:
3536
- name: Run init script
3637
run: docker exec -e CORE_BRANCH tests-runner bash -c 'PYTHONPATH=$PWD make init'
3738
env:
38-
CORE_BRANCH: master
39+
CORE_BRANCH: develop
3940

4041
- name: Run node
4142
run: docker exec -e ETH_RPC_URL --detach tests-runner bash -c 'NODE_PORT=8545 make node'

.github/workflows/dual_governance_regression.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ on:
1313
- "feat/rc2"
1414
- "feat/rc1"
1515
- "feat/next-vote"
16+
- "feat/v3-phase-2"
1617
workflow_dispatch:
1718

1819
jobs:

.github/workflows/normal_vote_ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
jobs:
1313
run-tests-normal-1:
1414
name: Brownie fork NORMAL tests 1
15-
runs-on: [voting-private-runners]
15+
runs-on: [ubuntu-latest]
1616
timeout-minutes: 150
1717

1818
services:
@@ -36,7 +36,7 @@ jobs:
3636

3737
run-tests-normal-2:
3838
name: Brownie fork NORMAL tests 2
39-
runs-on: [voting-private-runners]
39+
runs-on: [ubuntu-latest]
4040
timeout-minutes: 150
4141

4242
services:

configs/config_mainnet.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,8 @@
182182
CS_MODULE_NAME = "Community Staking"
183183
CS_MODULE_MODULE_FEE_BP = 600
184184
CS_MODULE_TREASURY_FEE_BP = 400
185-
CS_MODULE_TARGET_SHARE_BP = 500
186-
CS_MODULE_PRIORITY_EXIT_SHARE_THRESHOLD = 625
185+
CS_MODULE_TARGET_SHARE_BP = 750
186+
CS_MODULE_PRIORITY_EXIT_SHARE_THRESHOLD = 900
187187
CS_MODULE_MAX_DEPOSITS_PER_BLOCK = 30
188188
CS_MODULE_MIN_DEPOSIT_BLOCK_DISTANCE = 25
189189

@@ -407,6 +407,7 @@
407407
CS_PERMISSIONLESS_GATE_ADDRESS = "0xcF33a38111d0B1246A3F38a838fb41D626B454f0"
408408
CS_VERIFIER_V2_ADDRESS = "0xdC5FE1782B6943f318E05230d688713a560063DC"
409409
CS_GATE_SEAL_V2_ADDRESS = "0xE1686C2E90eb41a48356c1cC7FaA17629af3ADB3"
410+
TWO_PHASE_FRAME_CONFIG_UPDATE = "0xb2B4DB1491cbe949ae85EfF01E0d3ee239f110C1"
410411

411412
# DualGovernance
412413
DUAL_GOVERNANCE = "0xC1db28B3301331277e307FDCfF8DE28242A4486E"
@@ -530,7 +531,7 @@
530531
OPERATOR_GRID = "0xC69685E89Cefc327b43B7234AC646451B27c544d"
531532
LAZY_ORACLE = "0x5DB427080200c235F2Ae8Cd17A7be87921f7AD6c"
532533
PREDEPOSIT_GUARANTEE = "0xF4bF42c6D6A0E38825785048124DBAD6c9eaaac3"
533-
VAULTS_ADAPTER = "0xe2DE6d2DefF15588a71849c0429101F8ca9FB14D"
534+
VAULTS_ADAPTER = "0x28F9Ac198C4E0FA6A9Ad2c2f97CB38F1A3120f27"
534535
GATE_SEAL_V3 = "0x881dAd714679A6FeaA636446A0499101375A365c"
535536
STAKING_VAULT_BEACON = "0x5FbE8cEf9CCc56ad245736D3C5bAf82ad54Ca789"
536537

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[{"inputs":[{"internalType":"address","name":"oracle","type":"address"},{"components":[{"internalType":"uint256","name":"reportsToProcessBeforeOffsetPhase","type":"uint256"},{"internalType":"uint256","name":"reportsToProcessBeforeRestorePhase","type":"uint256"},{"internalType":"uint256","name":"offsetPhaseEpochsPerFrame","type":"uint256"},{"internalType":"uint256","name":"restorePhaseFastLaneLengthSlots","type":"uint256"}],"internalType":"struct TwoPhaseFrameConfigUpdate.PhasesConfig","name":"phasesConfig","type":"tuple"}],"stateMutability":"nonpayable","type":"constructor"},{"inputs":[],"name":"CurrentReportMainPhaseIsNotCompleted","type":"error"},{"inputs":[],"name":"FastLanePeriodCannotBeLongerThanFrame","type":"error"},{"inputs":[],"name":"FastLaneTooShort","type":"error"},{"inputs":[],"name":"NoneOfPhasesExpired","type":"error"},{"inputs":[],"name":"OffsetPhaseNotExecuted","type":"error"},{"inputs":[],"name":"PhaseAlreadyExecuted","type":"error"},{"inputs":[{"internalType":"uint256","name":"currentSlot","type":"uint256"},{"internalType":"uint256","name":"deadlineSlot","type":"uint256"}],"name":"PhaseExpired","type":"error"},{"inputs":[{"internalType":"uint256","name":"actual","type":"uint256"},{"internalType":"uint256","name":"expected","type":"uint256"}],"name":"UnexpectedLastProcessingRefSlot","type":"error"},{"inputs":[],"name":"ZeroEpochsPerFrame","type":"error"},{"inputs":[],"name":"ZeroOracleAddress","type":"error"},{"inputs":[],"name":"ZeroReportsToEnableUpdate","type":"error"},{"anonymous":false,"inputs":[],"name":"OffsetPhaseExecuted","type":"event"},{"anonymous":false,"inputs":[],"name":"RestorePhaseExecuted","type":"event"},{"inputs":[],"name":"GENESIS_TIME","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"HASH_CONSENSUS","outputs":[{"internalType":"contract IConsensusContract","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"OFFSET_PHASE_FAST_LANE_LENGTH","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"ORACLE","outputs":[{"internalType":"contract IReportAsyncProcessor","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"SECONDS_PER_SLOT","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"SLOTS_PER_EPOCH","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"executeOffsetPhase","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"executeRestorePhase","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"getExpirationStatus","outputs":[{"internalType":"bool","name":"offsetExpired","type":"bool"},{"internalType":"bool","name":"restoreExpired","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"isReadyForOffsetPhase","outputs":[{"internalType":"bool","name":"ready","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"isReadyForRestorePhase","outputs":[{"internalType":"bool","name":"ready","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"offsetPhase","outputs":[{"internalType":"uint256","name":"expectedProcessingRefSlot","type":"uint256"},{"internalType":"uint256","name":"expirationSlot","type":"uint256"},{"internalType":"uint256","name":"epochsPerFrame","type":"uint256"},{"internalType":"uint256","name":"fastLaneLengthSlots","type":"uint256"},{"internalType":"bool","name":"executed","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"renounceRoleWhenExpired","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"restorePhase","outputs":[{"internalType":"uint256","name":"expectedProcessingRefSlot","type":"uint256"},{"internalType":"uint256","name":"expirationSlot","type":"uint256"},{"internalType":"uint256","name":"epochsPerFrame","type":"uint256"},{"internalType":"uint256","name":"fastLaneLengthSlots","type":"uint256"},{"internalType":"bool","name":"executed","type":"bool"}],"stateMutability":"view","type":"function"}]

0 commit comments

Comments
 (0)