Merge branch 'master' into feat/core-integrations

Author: Ivan-Feofanov

tests/acceptance/test_simple_dvt_module.py

@@ -131,6 +131,8 @@ def test_simple_dvt_state(contract):
             assert (
                 node_operator_summary["isTargetLimitActive"] is True
             ), f"isTargetLimitActive is inactive for node {id}"
+
+            assert node_operator_summary["depositableValidatorsCount"] == 0
         else:
             assert node_operator_summary["isTargetLimitActive"] is False, f"isTargetLimitActive is active for node {id}"
         assert node_operator_summary["targetValidatorsCount"] == 0
@@ -150,11 +152,12 @@ def test_simple_dvt_state(contract):
         assert node_operator["totalExitedValidators"] == node_operator_summary["totalExitedValidators"]
         assert node_operator["totalDepositedValidators"] == node_operator_summary["totalDepositedValidators"]
 
-        no_depositable_validators_count = (
-            node_operator["totalVettedValidators"] - node_operator["totalDepositedValidators"]
-        )
 
-        assert node_operator_summary["depositableValidatorsCount"] == no_depositable_validators_count
+        if node_operator_summary["isTargetLimitActive"] == False:
+            no_depositable_validators_count = (
+                node_operator["totalVettedValidators"] - node_operator["totalDepositedValidators"]
+            )
+            assert node_operator_summary["depositableValidatorsCount"] == no_depositable_validators_count
 
 
 def test_simple_dvt_permissions(contract):

tests/acceptance/test_withdrawals_negative.py

@@ -109,8 +109,10 @@ def test_wq_prefinalize(wq: Contract, steth_whale: Account):
 def test_request_to_finalize_to_close(wq: Contract, steth_whale: Account):
     wait_to_next_available_report_time(contracts.hash_consensus_for_accounting_oracle)
     fill_wq(wq, steth_whale, count=1)
+    wd_status = wq.getWithdrawalStatus([wq.getLastRequestId()])
+    wd_time = wd_status["statuses"][3]
 
-    with reverts(revert_pattern="IncorrectRequestFinalization: \\d*"):
+    with reverts(encode_error("IncorrectRequestFinalization(uint256)", [wd_time])):
         oracle_report(
             withdrawalFinalizationBatches=[wq.getLastRequestId()],
             wait_to_next_report_time=False,

tests/regression/test_sdvt_rewards_happy_path.py

@@ -110,7 +110,7 @@ def test_rewards_distribution_happy_path(simple_dvt_module_id, cluster_participa
     assert cluster_rewards_before_report == 0
 
     # oracle report
-    oracle_report(cl_diff=ETH(100))
+    oracle_report(cl_diff=ETH(500))
     cluster_rewards_after_report = lido.balanceOf(new_reward_address)
 
     # check that cluster reward address balance increased

utils/test/simple_dvt_helpers.py

@@ -12,6 +12,7 @@
 
 MIN_OP_KEYS_CNT = 10
 MIN_OPS_CNT = 3
+MAX_KEYS_BATCH_SIZE = 100
 
 
 def get_operator_name(id: int, group: int = 0):
@@ -115,35 +116,34 @@ def simple_dvt_add_node_operators(simple_dvt, stranger, input_params=[]):
         create_and_enact_motion(contracts.easy_track, trusted_caller, factory, calldata, stranger)
         node_operators_count_after = simple_dvt.getNodeOperatorsCount()
 
-    return (node_operators_count_before, node_operators_count_after)
+    return node_operators_count_before, node_operators_count_after
 
 
 def simple_dvt_add_keys(simple_dvt, node_operator_id, keys_count=1):
-    pubkeys_batch = random_pubkeys_batch(keys_count)
-    signatures_batch = random_signatures_batch(keys_count)
-
-    total_signing_keys_count_before = simple_dvt.getTotalSigningKeyCount(node_operator_id)
-    unused_signing_keys_count_before = simple_dvt.getUnusedSigningKeyCount(node_operator_id)
-    node_operator_before = simple_dvt.getNodeOperator(node_operator_id, False)
-
-    web3.manager.request_blocking(
-        "hardhat_setBalance",  # type: ignore
-        [
-            node_operator_before["rewardAddress"],
-            Web3.to_hex(90_000_000_000),
-        ],
-    )
+    remained_keys_count = keys_count
 
-    tx = simple_dvt.addSigningKeys(
-        node_operator_id,
-        keys_count,
-        pubkeys_batch,
-        signatures_batch,
-        {"from": node_operator_before["rewardAddress"], "gas_price": 4},
-    )
+    while remained_keys_count > 0:
+        batch_size = min(remained_keys_count, MAX_KEYS_BATCH_SIZE)
+
+        pubkeys_batch = random_pubkeys_batch(batch_size)
+        signatures_batch = random_signatures_batch(batch_size)
+
+        total_signing_keys_count_before = simple_dvt.getTotalSigningKeyCount(node_operator_id)
+        unused_signing_keys_count_before = simple_dvt.getUnusedSigningKeyCount(node_operator_id)
+        node_operator_before = simple_dvt.getNodeOperator(node_operator_id, False)
+
+        tx = simple_dvt.addSigningKeys(
+            node_operator_id,
+            batch_size,
+            pubkeys_batch,
+            signatures_batch,
+            {"from": node_operator_before["rewardAddress"]},
+        )
+
+        total_signing_keys_count_after = simple_dvt.getTotalSigningKeyCount(node_operator_id)
+        unused_signing_keys_count_after = simple_dvt.getUnusedSigningKeyCount(node_operator_id)
 
-    total_signing_keys_count_after = simple_dvt.getTotalSigningKeyCount(node_operator_id)
-    unused_signing_keys_count_after = simple_dvt.getUnusedSigningKeyCount(node_operator_id)
+        assert total_signing_keys_count_after == total_signing_keys_count_before + batch_size
+        assert unused_signing_keys_count_after == unused_signing_keys_count_before + batch_size
 
-    assert total_signing_keys_count_after == total_signing_keys_count_before + keys_count
-    assert unused_signing_keys_count_after == unused_signing_keys_count_before + keys_count
+        remained_keys_count -= batch_size