Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/core_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
- "feat/rc2"
- "feat/rc1"
- "feat/next-vote"
- "feat/v3-vote"
- "v1_dg1"
schedule:
- cron: "0 0 * * TUE"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dual_governance_regression.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
- "feat/rc2"
- "feat/rc1"
- "feat/next-vote"
- "feat/v3-vote"
- "v1_dg1"
workflow_dispatch:

jobs:
Expand Down
8 changes: 4 additions & 4 deletions configs/config_mainnet.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,8 @@

CURATED_STAKING_MODULE_STUCK_PENALTY_DELAY = 0
CURATED_STAKING_MODULE_TARGET_SHARE_BP = 10000
CURATED_STAKING_MODULE_MODULE_FEE_BP = 350
CURATED_STAKING_MODULE_TREASURY_FEE_BP = 650
CURATED_STAKING_MODULE_MODULE_FEE_BP = 500
CURATED_STAKING_MODULE_TREASURY_FEE_BP = 500
CURATED_STAKING_MODULE_ID = 1
CURATED_STAKING_MODULE_NAME = "curated-onchain-v1"
CURATED_STAKING_MODULE_TYPE = (
Expand All @@ -162,7 +162,7 @@
SIMPLE_DVT_ARAGON_APP_NAME = "simple-dvt"
SIMPLE_DVT_ARAGON_APP_ID = "0xe1635b63b5f7b5e545f2a637558a4029dea7905361a2f0fc28c66e9136cf86a4"
SIMPLE_DVT_MODULE_STUCK_PENALTY_DELAY = 0
SIMPLE_DVT_MODULE_TARGET_SHARE_BP = 430
SIMPLE_DVT_MODULE_TARGET_SHARE_BP = 400
SIMPLE_DVT_MODULE_MODULE_FEE_BP = 800
SIMPLE_DVT_MODULE_TREASURY_FEE_BP = 200
SIMPLE_DVT_MODULE_ID = 2
Expand All @@ -172,7 +172,7 @@
"0x637572617465642d6f6e636861696e2d76310000000000000000000000000000"
)
SIMPLE_DVT_VERSION = 4
SIMPLE_DVT_MODULE_PRIORITY_EXIT_SHARE_THRESHOLD = 478
SIMPLE_DVT_MODULE_PRIORITY_EXIT_SHARE_THRESHOLD = 444
SIMPLE_DVT_MODULE_MAX_DEPOSITS_PER_BLOCK = 150
SIMPLE_DVT_MODULE_MIN_DEPOSITS_BLOCK_DISTANCE = 25

Expand Down
348 changes: 0 additions & 348 deletions scripts/vote_2025_12_15.py

This file was deleted.

2 changes: 1 addition & 1 deletion tests/acceptance/test_node_operators_registry.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ def test_nor_state(contract):

node_operator_summary = contract.getNodeOperatorSummary(id)
exited_node_operators = [12, 1] # NO id 12 was added on vote 23-05-23, NO id 1 was added on vote 03-10-23
soft_limit_0_node_operators = [32] # NO id 32 was added on vote 10-12-25
soft_limit_0_node_operators = [] # NO id 32 was added on vote 10-12-25
assert node_operator_summary["targetLimitMode"] == (1 if id in exited_node_operators or id in soft_limit_0_node_operators else 0)
assert node_operator_summary["targetValidatorsCount"] == 0
# Can be more than 0 in regular protocol operations
Expand Down
2 changes: 1 addition & 1 deletion tests/snapshot/test_voting.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ def test_create_wait_enact(helpers, vote_time, call_target, vote_ids_from_env, d
for step_name, diff in step_diffs.items():
if not vote_ids_from_env:
assert_expected_diffs(
step_name, diff, {"votesLength": ValueChanged(from_val=votesLength + 1, to_val=votesLength + 3)}
step_name, diff, {"votesLength": ValueChanged(from_val=votesLength + 1, to_val=votesLength + 2)}
)
assert_no_diffs(step_name, diff)

Expand Down
84 changes: 1 addition & 83 deletions tests/test_2025_12_15.py
Original file line number Diff line number Diff line change
@@ -1,92 +1,10 @@
import pytest
import brownie
import tests.utils_test_2025_12_15_lidov3 as lidov3
import tests.utils_test_2025_12_15_operations as ops

@pytest.fixture(autouse=True)
def isolation():
brownie.chain.reset()

def test_vote_v1_v2_dg1_dg2(helpers, accounts, ldo_holder, vote_ids_from_env, stranger):
def test_vote_v1_dg1(helpers, accounts, ldo_holder, vote_ids_from_env, stranger):

lidov3.enact_and_test_voting(helpers, accounts, ldo_holder, vote_ids_from_env, stranger,
194, 6,
)

ops.enact_and_test_voting(helpers, accounts, ldo_holder, vote_ids_from_env, stranger,
195, 7,
)

lidov3.enact_and_test_dg(stranger, 6)

ops.enact_and_test_dg(stranger, 7)

def test_vote_v1_v2_dg2_dg1(helpers, accounts, ldo_holder, vote_ids_from_env, stranger):

lidov3.enact_and_test_voting(helpers, accounts, ldo_holder, vote_ids_from_env, stranger,
194, 6,
)

ops.enact_and_test_voting(helpers, accounts, ldo_holder, vote_ids_from_env, stranger,
195, 7,
)

ops.enact_and_test_dg(stranger, 7)

lidov3.enact_and_test_dg(stranger, 6)

def test_vote_v1_dg1_v2_dg2(helpers, accounts, ldo_holder, vote_ids_from_env, stranger):

lidov3.enact_and_test_voting(helpers, accounts, ldo_holder, vote_ids_from_env, stranger,
194, 6,
)

lidov3.enact_and_test_dg(stranger, 6)

ops.enact_and_test_voting(helpers, accounts, ldo_holder, vote_ids_from_env, stranger,
195, 7,
)

ops.enact_and_test_dg(stranger, 7)

def test_vote_v2_v1_dg1_dg2(helpers, accounts, ldo_holder, vote_ids_from_env, stranger):

ops.enact_and_test_voting(helpers, accounts, ldo_holder, vote_ids_from_env, stranger,
194, 6,
)

lidov3.enact_and_test_voting(helpers, accounts, ldo_holder, vote_ids_from_env, stranger,
195, 7,
)

lidov3.enact_and_test_dg(stranger, 7)

ops.enact_and_test_dg(stranger, 6)

def test_vote_v2_v1_dg2_dg1(helpers, accounts, ldo_holder, vote_ids_from_env, stranger):

ops.enact_and_test_voting(helpers, accounts, ldo_holder, vote_ids_from_env, stranger,
194, 6,
)

lidov3.enact_and_test_voting(helpers, accounts, ldo_holder, vote_ids_from_env, stranger,
195, 7,
)

ops.enact_and_test_dg(stranger, 6)

lidov3.enact_and_test_dg(stranger, 7)

def test_vote_v2_dg2_v1_dg1(helpers, accounts, ldo_holder, vote_ids_from_env, stranger):

ops.enact_and_test_voting(helpers, accounts, ldo_holder, vote_ids_from_env, stranger,
194, 6,
)

ops.enact_and_test_dg(stranger, 6)

lidov3.enact_and_test_voting(helpers, accounts, ldo_holder, vote_ids_from_env, stranger,
195, 7,
)

lidov3.enact_and_test_dg(stranger, 7)
Loading
Loading