feat: use deposit queries

mkoura · mkoura · commit dcea5da06fe7 · 2025-03-12T14:07:34.000+01:00
Replace reading deposit values from genesis files with deposit query
functions that get the deposit values from current pparams.
diff --git a/cardano_node_tests/tests/test_node_upgrade.py b/cardano_node_tests/tests/test_node_upgrade.py
@@ -215,7 +215,7 @@ def test_hardfork(
         governance_utils.wait_delayed_ratification(cluster_obj=cluster)
 
         # Create an action
-        deposit_amt = cluster.conway_genesis["govActionDeposit"]
+        deposit_amt = cluster.g_query.get_gov_action_deposit()
         anchor_data = governance_utils.get_default_anchor_data()
         prev_action_rec = governance_utils.get_prev_action(
             action_type=governance_utils.PrevGovActionIds.HARDFORK,
diff --git a/cardano_node_tests/tests/tests_conway/conway_common.py b/cardano_node_tests/tests/tests_conway/conway_common.py
@@ -427,7 +427,7 @@ def propose_change_constitution(
     constitution_script_hash: str = "",
 ) -> tuple[clusterlib.ActionConstitution, str, int]:
     """Propose a constitution change."""
-    deposit_amt = cluster_obj.conway_genesis["govActionDeposit"]
+    deposit_amt = cluster_obj.g_query.get_gov_action_deposit()
 
     prev_action_rec = governance_utils.get_prev_action(
         action_type=governance_utils.PrevGovActionIds.CONSTITUTION,
@@ -503,7 +503,7 @@ def propose_pparams_update(
     prev_action_rec: governance_utils.PrevActionRec | None = None,
 ) -> PParamPropRec:
     """Propose a pparams update."""
-    deposit_amt = cluster_obj.conway_genesis["govActionDeposit"]
+    deposit_amt = cluster_obj.g_query.get_gov_action_deposit()
 
     prev_action_rec = prev_action_rec or governance_utils.get_prev_action(
         action_type=governance_utils.PrevGovActionIds.PPARAM_UPDATE,
diff --git a/cardano_node_tests/tests/tests_conway/test_committee.py b/cardano_node_tests/tests/tests_conway/test_committee.py
@@ -172,6 +172,7 @@ def test_invalid_cc_member_vote(  # noqa: C901
         """
         cluster, governance_data = cluster_use_governance
         temp_template = common.get_test_id(cluster)
+        deposit_amt = cluster.g_query.get_gov_action_deposit()
 
         submit_methods = [submit_utils.SubmitMethods.CLI]
         if submit_utils.is_submit_api_available():
@@ -278,7 +279,6 @@ def _submit_vote(scenario: str, build_method: str, submit_method: str) -> None:
             return
 
         def _propose_new_member() -> None:
-            deposit_amt = cluster.conway_genesis["govActionDeposit"]
             anchor_data = governance_utils.get_default_anchor_data()
             prev_action_rec = governance_utils.get_prev_action(
                 action_type=governance_utils.PrevGovActionIds.COMMITTEE,
@@ -446,7 +446,7 @@ def test_update_committee_action(
             for r in cc_auth_records
         ]
 
-        deposit_amt = cluster.conway_genesis["govActionDeposit"]
+        deposit_amt = cluster.g_query.get_gov_action_deposit()
         anchor_data = governance_utils.get_default_anchor_data()
         prev_action_rec = governance_utils.get_prev_action(
             action_type=governance_utils.PrevGovActionIds.COMMITTEE,
@@ -598,7 +598,7 @@ def test_add_rm_committee_members(  # noqa: C901
             pool_user_lg.stake.address
         ).reward_account_balance
 
-        deposit_amt = cluster.conway_genesis["govActionDeposit"]
+        deposit_amt = cluster.g_query.get_gov_action_deposit()
 
         # Check if total delegated stake is below the threshold. This can be used to check that
         # undelegated stake is treated as Abstain. If undelegated stake was treated as No, it
@@ -1345,7 +1345,7 @@ def test_empty_committee(
         if conway_common.is_in_bootstrap(cluster_obj=cluster):
             pytest.skip("Cannot run during bootstrap period.")
 
-        deposit_amt = cluster.conway_genesis["govActionDeposit"]
+        deposit_amt = cluster.g_query.get_gov_action_deposit()
 
         def _set_zero_committee_pparam() -> conway_common.PParamPropRec:
             """Set the `committeeMinSize` pparam to 0."""
@@ -1725,7 +1725,7 @@ def _check_rat_enact_state(
 
             assert prev_action_rec.txid == action_txid, "Action not enacted"
 
-        deposit_amt = cluster.conway_genesis["govActionDeposit"]
+        deposit_amt = cluster.g_query.get_gov_action_deposit()
         anchor_data = governance_utils.get_default_anchor_data()
         prev_action_rec = governance_utils.get_prev_action(
             action_type=governance_utils.PrevGovActionIds.COMMITTEE,
diff --git a/cardano_node_tests/tests/tests_conway/test_constitution.py b/cardano_node_tests/tests/tests_conway/test_constitution.py
@@ -341,6 +341,7 @@ def test_change_constitution(
         rand_str = clusterlib.get_rand_str(4)
         governance_data = governance_w_scripts_lg
         temp_template = f"{common.get_test_id(cluster)}_{rand_str}"
+        deposit_amt = cluster.g_query.get_gov_action_deposit()
 
         init_return_account_balance = cluster.g_query.get_stake_addr_info(
             pool_user_lg.stake.address
@@ -535,10 +536,9 @@ def _check_cli_query():
             pool_user_lg.stake.address
         ).reward_account_balance
 
-        assert (
-            enact_deposit_returned
-            == init_return_account_balance + cluster.conway_genesis["govActionDeposit"]
-        ), "Incorrect return account balance"
+        assert enact_deposit_returned == init_return_account_balance + deposit_amt, (
+            "Incorrect return account balance"
+        )
 
         reqc.cip027.start(url=helpers.get_vcs_link())
         # Try to withdraw the deposit from stake address that is not delegated to a DRep
diff --git a/cardano_node_tests/tests/tests_conway/test_drep.py b/cardano_node_tests/tests/tests_conway/test_drep.py
@@ -353,7 +353,7 @@ def test_register_and_retire_drep(
         * Check that deposit was returned to source address
         """
         temp_template = common.get_test_id(cluster)
-        deposit_drep_amt = cluster.conway_genesis["dRepDeposit"]
+        deposit_drep_amt = cluster.g_query.get_drep_deposit()
 
         # Make sure there's enought funds on the payment address on long running
         # testnets where the DRep deposit is higher.
@@ -629,7 +629,7 @@ def test_no_witness_register_and_retire(  # noqa: C901
         * Check that DRep was retired
         """
         temp_template = common.get_test_id(cluster)
-        deposit_drep_amt = cluster.conway_genesis["dRepDeposit"]
+        deposit_drep_amt = cluster.g_query.get_drep_deposit()
 
         # Make sure there's enought funds on the payment address on long running
         # testnets where the DRep deposit is higher.
@@ -772,8 +772,9 @@ def test_no_multiple_delegation(
         """
         cluster = cluster_rewards
         temp_template = common.get_test_id(cluster)
-        deposit_address_amt = cluster.g_query.get_address_deposit()
-        deposit_drep_amt = cluster.conway_genesis["dRepDeposit"]
+        pparams = cluster.g_query.get_protocol_params()
+        deposit_address_amt = cluster.g_query.get_address_deposit(pparams=pparams)
+        deposit_drep_amt = cluster.g_query.get_drep_deposit(pparams=pparams)
 
         # Make sure there's enought funds on the payment address on long running
         # testnets where the DRep deposit is higher.
@@ -927,7 +928,7 @@ def test_drep_no_retirement_before_register(
         * Check that it is not possible to retire before registering the DRep
         """
         temp_template = common.get_test_id(cluster)
-        deposit_drep_amt = cluster.conway_genesis["dRepDeposit"]
+        deposit_drep_amt = cluster.g_query.get_drep_deposit()
 
         drep_keys = cluster.g_conway_governance.drep.gen_key_pair(
             key_name=temp_template, destination_dir="."
@@ -981,7 +982,7 @@ def test_drep_no_multiple_registration(
         * Expect ConwayDRepAlreadyRegistered on the second time
         """
         temp_template = common.get_test_id(cluster)
-        deposit_drep_amt = cluster.conway_genesis["dRepDeposit"]
+        deposit_drep_amt = cluster.g_query.get_drep_deposit()
 
         # Make sure there's enought funds on the payment address on long running
         # testnets where the DRep deposit is higher.
@@ -1445,8 +1446,9 @@ def test_change_delegation(
         """
         cluster = cluster_rewards
         temp_template = common.get_test_id(cluster)
-        deposit_address_amt = cluster.g_query.get_address_deposit()
-        deposit_drep_amt = cluster.conway_genesis["dRepDeposit"]
+        pparams = cluster.g_query.get_protocol_params()
+        deposit_address_amt = cluster.g_query.get_address_deposit(pparams=pparams)
+        deposit_drep_amt = cluster.g_query.get_drep_deposit(pparams=pparams)
 
         # Make sure there's enought funds on the payment address on long running
         # testnets where the DRep deposit is higher.
diff --git a/cardano_node_tests/tests/tests_conway/test_guardrails.py b/cardano_node_tests/tests/tests_conway/test_guardrails.py
@@ -225,7 +225,7 @@ def propose_param_changes(
 
     temp_template = common.get_test_id(cluster)
     anchor_data = governance_utils.get_default_anchor_data()
-    deposit_amt = cluster.conway_genesis["govActionDeposit"]
+    deposit_amt = cluster.g_query.get_gov_action_deposit()
     prev_action_rec = governance_utils.get_prev_action(
         action_type=governance_utils.PrevGovActionIds.PPARAM_UPDATE,
         gov_state=cluster.g_conway_governance.query.gov_state(),
diff --git a/cardano_node_tests/tests/tests_conway/test_hardfork.py b/cardano_node_tests/tests/tests_conway/test_hardfork.py
@@ -74,7 +74,7 @@ def test_hardfork(
         ).reward_account_balance
 
         # Create an action
-        deposit_amt = cluster.conway_genesis["govActionDeposit"]
+        deposit_amt = cluster.g_query.get_gov_action_deposit()
         anchor_data = governance_utils.get_default_anchor_data()
         prev_action_rec = governance_utils.get_prev_action(
             action_type=governance_utils.PrevGovActionIds.HARDFORK,
diff --git a/cardano_node_tests/tests/tests_conway/test_info.py b/cardano_node_tests/tests/tests_conway/test_info.py
@@ -68,7 +68,7 @@ def test_info(
         """
         cluster, governance_data = cluster_use_governance
         temp_template = common.get_test_id(cluster)
-        action_deposit_amt = cluster.conway_genesis["govActionDeposit"]
+        action_deposit_amt = cluster.g_query.get_gov_action_deposit()
 
         # Get initial return account balance
         init_return_account_balance = cluster.g_query.get_stake_addr_info(
diff --git a/cardano_node_tests/tests/tests_conway/test_no_confidence.py b/cardano_node_tests/tests/tests_conway/test_no_confidence.py
@@ -98,7 +98,7 @@ def test_no_confidence_action(
         ).reward_account_balance
 
         # Create an action
-        deposit_amt = cluster.conway_genesis["govActionDeposit"]
+        deposit_amt = cluster.g_query.get_gov_action_deposit()
         anchor_data = governance_utils.get_default_anchor_data()
 
         _url = helpers.get_vcs_link()
diff --git a/cardano_node_tests/tests/tests_conway/test_pparam_update.py b/cardano_node_tests/tests/tests_conway/test_pparam_update.py
@@ -1272,7 +1272,7 @@ def _check_state(state: dict):
         # Check that deposit is returned for the enacted pparam proposal right after enactment.
         # Check that deposit is returned also for pparam proposals that are no longer valid
         # (all the remaining pparam proposals in our case).
-        deposit_amt = cluster.conway_genesis["govActionDeposit"]
+        deposit_amt = cluster.g_query.get_gov_action_deposit()
         total_deposit_return = cluster.g_query.get_stake_addr_info(
             pool_user_lgp.stake.address
         ).reward_account_balance
diff --git a/cardano_node_tests/tests/tests_conway/test_treasury_withdrawals.py b/cardano_node_tests/tests/tests_conway/test_treasury_withdrawals.py
@@ -115,9 +115,11 @@ def test_enact_treasury_withdrawals(
         temp_template = common.get_test_id(cluster)
         actions_num = 3
 
-        # Create stake address and registration certificate
-        stake_deposit_amt = cluster.g_query.get_address_deposit()
+        pparams = cluster.g_query.get_protocol_params()
+        stake_deposit_amt = cluster.g_query.get_address_deposit(pparams=pparams)
+        action_deposit_amt = cluster.g_query.get_gov_action_deposit(pparams=pparams)
 
+        # Create stake address and registration certificate
         recv_stake_addr_rec = cluster.g_stake_address.gen_stake_addr_and_keys(
             name=f"{temp_template}_receive"
         )
@@ -128,8 +130,6 @@ def test_enact_treasury_withdrawals(
         )
 
         # Create an action and register stake address
-
-        action_deposit_amt = cluster.conway_genesis["govActionDeposit"]
         transfer_amts = list(range(10_000_000_000, 10_000_000_000 + actions_num))
 
         anchor_data = governance_utils.get_default_anchor_data()
@@ -455,9 +455,11 @@ def test_expire_treasury_withdrawals(
         is_in_bootstrap = conway_common.is_in_bootstrap(cluster_obj=cluster)
         actions_num = 3
 
-        # Create stake address and registration certificate
-        stake_deposit_amt = cluster.g_query.get_address_deposit()
+        pparams = cluster.g_query.get_protocol_params()
+        stake_deposit_amt = cluster.g_query.get_address_deposit(pparams=pparams)
+        action_deposit_amt = cluster.g_query.get_gov_action_deposit(pparams=pparams)
 
+        # Create stake address and registration certificate
         recv_stake_addr_rec = cluster.g_stake_address.gen_stake_addr_and_keys(
             name=f"{temp_template}_receive"
         )
@@ -468,8 +470,6 @@ def test_expire_treasury_withdrawals(
         )
 
         # Create an action and register stake address
-
-        action_deposit_amt = cluster.conway_genesis["govActionDeposit"]
         transfer_amt = 5_000_000_000
         init_return_account_balance = cluster.g_query.get_stake_addr_info(
             pool_user_ug.stake.address
diff --git a/cardano_node_tests/utils/governance_setup.py b/cardano_node_tests/utils/governance_setup.py
@@ -157,7 +157,7 @@ def load_committee(cluster_obj: clusterlib.ClusterLib) -> list[governance_utils.
 def load_dreps(cluster_obj: clusterlib.ClusterLib) -> list[governance_utils.DRepRegistration]:
     """Load DReps from the state directory."""
     data_dir = cluster_obj.state_dir / GOV_DATA_DIR
-    deposit_amt = cluster_obj.conway_genesis["dRepDeposit"]
+    deposit_amt = cluster_obj.g_query.get_drep_deposit()
 
     dreps = []
     for vkey_file in sorted(data_dir.glob("default_drep_*_drep.vkey")):
@@ -436,7 +436,7 @@ def reinstate_committee(
     """Reinstate the original CC members."""
     # Create an "update committee" action
 
-    deposit_amt = cluster_obj.conway_genesis["govActionDeposit"]
+    deposit_amt = cluster_obj.g_query.get_gov_action_deposit()
     anchor_data = governance_utils.get_default_anchor_data()
     prev_action_rec = governance_utils.get_prev_action(
         action_type=governance_utils.PrevGovActionIds.COMMITTEE,
diff --git a/cardano_node_tests/utils/governance_utils.py b/cardano_node_tests/utils/governance_utils.py
@@ -263,7 +263,7 @@ def get_drep_reg_record(
     destination_dir: clusterlib.FileType = ".",
 ) -> DRepRegistration:
     """Get DRep registration record."""
-    deposit_amt = deposit_amt if deposit_amt != -1 else cluster_obj.conway_genesis["dRepDeposit"]
+    deposit_amt = deposit_amt if deposit_amt != -1 else cluster_obj.g_query.get_drep_deposit()
     drep_keys = cluster_obj.g_conway_governance.drep.gen_key_pair(
         key_name=name_template, destination_dir=destination_dir
     )
@@ -298,7 +298,7 @@ def get_script_drep_reg_record(
     destination_dir: clusterlib.FileType = ".",
 ) -> DRepScriptRegRecord:
     """Get DRep script registration record."""
-    deposit_amt = deposit_amt if deposit_amt != -1 else cluster_obj.conway_genesis["dRepDeposit"]
+    deposit_amt = deposit_amt if deposit_amt != -1 else cluster_obj.g_query.get_drep_deposit()
     reg_cert = cluster_obj.g_conway_governance.drep.gen_registration_cert(
         cert_name=name_template,
         deposit_amt=deposit_amt,
@@ -661,7 +661,7 @@ def create_dreps(
 
     stake_deposit = cluster_obj.g_query.get_address_deposit()
     drep_users = pool_users[:num]
-    deposit_amt = cluster_obj.conway_genesis["dRepDeposit"]
+    deposit_amt = cluster_obj.g_query.get_drep_deposit()
 
     # Create DRep registration certs
     drep_reg_records = [
@@ -743,7 +743,7 @@ def create_script_dreps(
 
     stake_deposit = cluster_obj.g_query.get_address_deposit()
     drep_users = pool_users[:no_of_scripts]
-    deposit_amt = cluster_obj.conway_genesis["dRepDeposit"]
+    deposit_amt = cluster_obj.g_query.get_drep_deposit()
 
     # Create DRep script registration certs
     drep_reg_records = [
diff --git a/cardano_node_tests/utils/testnet_cleanup.py b/cardano_node_tests/utils/testnet_cleanup.py
@@ -280,7 +280,7 @@ def cleanup_certs(
 ) -> None:
     """Cleanup DRep certs."""
     files_found = find_cert_files(location)
-    drep_deposit_amt = cluster_obj.conway_genesis["dRepDeposit"]
+    drep_deposit_amt = cluster_obj.g_query.get_drep_deposit()
 
     # Fund the addresses that will pay for fees
     fund_addrs = [
