small contracts refactoring

Author: popenta

multiversx_sdk_cli/cli_contracts.py

@@ -350,12 +350,10 @@ def deploy(args: Any):
     validate_chain_id_args(args)
 
     sender = cli_shared.prepare_sender(args)
-
-    guardian = cli_shared.load_guardian_account(args)
-    guardian_address = cli_shared.get_guardian_address(guardian, args)
-
-    relayer = cli_shared.load_relayer_account(args)
-    relayer_address = cli_shared.get_relayer_address(relayer, args)
+    guardian_and_relayer_data = cli_shared.get_guardian_and_relayer_data(
+        sender=sender.address.to_bech32(),
+        args=args,
+    )
 
     chain_id = cli_shared.get_chain_id(args.chain, args.proxy)
     config = TransactionsFactoryConfig(chain_id)
@@ -379,12 +377,7 @@ def deploy(args: Any):
         nonce=sender.nonce,
         version=int(args.version),
         options=int(args.options),
-        guardian_account=guardian,
-        guardian_address=guardian_address,
-        relayer_account=relayer,
-        relayer_address=relayer_address,
-        guardian_service_url=args.guardian_service_url,
-        guardian_2fa_code=args.guardian_2fa_code,
+        guardian_and_relayer_data=guardian_and_relayer_data,
     )
 
     address_computer = AddressComputer(NUMBER_OF_SHARDS)
@@ -405,12 +398,10 @@ def call(args: Any):
     validate_chain_id_args(args)
 
     sender = cli_shared.prepare_sender(args)
-
-    guardian = cli_shared.load_guardian_account(args)
-    guardian_address = cli_shared.get_guardian_address(guardian, args)
-
-    relayer = cli_shared.load_relayer_account(args)
-    relayer_address = cli_shared.get_relayer_address(relayer, args)
+    guardian_and_relayer_data = cli_shared.get_guardian_and_relayer_data(
+        sender=sender.address.to_bech32(),
+        args=args,
+    )
 
     chain_id = cli_shared.get_chain_id(args.chain, args.proxy)
     config = TransactionsFactoryConfig(chain_id)
@@ -433,12 +424,7 @@ def call(args: Any):
         nonce=sender.nonce,
         version=int(args.version),
         options=int(args.options),
-        guardian_account=guardian,
-        guardian_address=guardian_address,
-        relayer_account=relayer,
-        relayer_address=relayer_address,
-        guardian_service_url=args.guardian_service_url,
-        guardian_2fa_code=args.guardian_2fa_code,
+        guardian_and_relayer_data=guardian_and_relayer_data,
     )
 
     _send_or_simulate(tx, contract_address, args)
@@ -453,12 +439,10 @@ def upgrade(args: Any):
     validate_chain_id_args(args)
 
     sender = cli_shared.prepare_sender(args)
-
-    guardian = cli_shared.load_guardian_account(args)
-    guardian_address = cli_shared.get_guardian_address(guardian, args)
-
-    relayer = cli_shared.load_relayer_account(args)
-    relayer_address = cli_shared.get_relayer_address(relayer, args)
+    guardian_and_relayer_data = cli_shared.get_guardian_and_relayer_data(
+        sender=sender.address.to_bech32(),
+        args=args,
+    )
 
     chain_id = cli_shared.get_chain_id(args.chain, args.proxy)
     config = TransactionsFactoryConfig(chain_id)
@@ -484,12 +468,7 @@ def upgrade(args: Any):
         nonce=sender.nonce,
         version=int(args.version),
         options=int(args.options),
-        guardian_account=guardian,
-        guardian_address=guardian_address,
-        relayer_account=relayer,
-        relayer_address=relayer_address,
-        guardian_service_url=args.guardian_service_url,
-        guardian_2fa_code=args.guardian_2fa_code,
+        guardian_and_relayer_data=guardian_and_relayer_data,
     )
 
     _send_or_simulate(tx, contract_address, args)

multiversx_sdk_cli/cli_delegation.py

@@ -394,28 +394,6 @@ def validate_arguments(args: Any):
     validate_chain_id_args(args)
 
 
-def prepare_sender(args: Any):
-    sender = cli_shared.prepare_account(args)
-    sender.nonce = (
-        int(args.nonce)
-        if args.nonce is not None
-        else cli_shared.get_current_nonce_for_address(sender.address, args.proxy)
-    )
-    return sender
-
-
-def prepare_guardian(args: Any):
-    guardian = cli_shared.load_guardian_account(args)
-    guardian_address = cli_shared.get_guardian_address(guardian, args)
-    return guardian, guardian_address
-
-
-def prepare_relayer(args: Any):
-    relayer = cli_shared.load_relayer_account(args)
-    relayer_address = cli_shared.get_relayer_address(relayer, args)
-    return relayer, relayer_address
-
-
 def _get_delegation_controller(args: Any):
     chain_id = cli_shared.get_chain_id(args.chain, args.proxy)
     config = TransactionsFactoryConfig(chain_id)

multiversx_sdk_cli/contracts.py

@@ -28,6 +28,7 @@
 from multiversx_sdk_cli import errors
 from multiversx_sdk_cli.base_transactions_controller import BaseTransactionsController
 from multiversx_sdk_cli.config import get_address_hrp
+from multiversx_sdk_cli.guardian_relayer_data import GuardianRelayerData
 from multiversx_sdk_cli.interfaces import IAccount
 
 logger = logging.getLogger("contracts")
@@ -73,12 +74,7 @@ def prepare_deploy_transaction(
         nonce: int,
         version: int,
         options: int,
-        guardian_account: Optional[IAccount] = None,
-        guardian_address: Optional[Address] = None,
-        relayer_account: Optional[IAccount] = None,
-        relayer_address: Optional[Address] = None,
-        guardian_service_url: str = "",
-        guardian_2fa_code: str = "",
+        guardian_and_relayer_data: GuardianRelayerData,
     ) -> Transaction:
         args = arguments if arguments else []
         if should_prepare_args:
@@ -98,16 +94,16 @@ def prepare_deploy_transaction(
         tx.nonce = nonce
         tx.version = version
         tx.options = options
-        tx.guardian = guardian_address
-        tx.relayer = relayer_address
+        tx.guardian = guardian_and_relayer_data.guardian_address
+        tx.relayer = guardian_and_relayer_data.relayer_address
 
         self.sign_transaction(
             transaction=tx,
             sender=owner,
-            guardian=guardian_account,
-            relayer=relayer_account,
-            guardian_service_url=guardian_service_url,
-            guardian_2fa_code=guardian_2fa_code,
+            guardian=guardian_and_relayer_data.guardian,
+            relayer=guardian_and_relayer_data.relayer,
+            guardian_service_url=guardian_and_relayer_data.guardian_service_url,
+            guardian_2fa_code=guardian_and_relayer_data.guardian_2fa_code,
         )
 
         return tx
@@ -125,12 +121,7 @@ def prepare_execute_transaction(
         nonce: int,
         version: int,
         options: int,
-        guardian_account: Optional[IAccount] = None,
-        guardian_address: Optional[Address] = None,
-        relayer_account: Optional[IAccount] = None,
-        relayer_address: Optional[Address] = None,
-        guardian_service_url: str = "",
-        guardian_2fa_code: str = "",
+        guardian_and_relayer_data: GuardianRelayerData,
     ) -> Transaction:
         token_transfers = self._prepare_token_transfers(transfers) if transfers else []
 
@@ -150,16 +141,16 @@ def prepare_execute_transaction(
         tx.nonce = nonce
         tx.version = version
         tx.options = options
-        tx.guardian = guardian_address
-        tx.relayer = relayer_address
+        tx.guardian = guardian_and_relayer_data.guardian_address
+        tx.relayer = guardian_and_relayer_data.relayer_address
 
         self.sign_transaction(
             transaction=tx,
             sender=caller,
-            guardian=guardian_account,
-            relayer=relayer_account,
-            guardian_service_url=guardian_service_url,
-            guardian_2fa_code=guardian_2fa_code,
+            guardian=guardian_and_relayer_data.guardian,
+            relayer=guardian_and_relayer_data.relayer,
+            guardian_service_url=guardian_and_relayer_data.guardian_service_url,
+            guardian_2fa_code=guardian_and_relayer_data.guardian_2fa_code,
         )
 
         return tx
@@ -180,12 +171,7 @@ def prepare_upgrade_transaction(
         nonce: int,
         version: int,
         options: int,
-        guardian_account: Optional[IAccount] = None,
-        guardian_address: Optional[Address] = None,
-        relayer_account: Optional[IAccount] = None,
-        relayer_address: Optional[Address] = None,
-        guardian_service_url: str = "",
-        guardian_2fa_code: str = "",
+        guardian_and_relayer_data: GuardianRelayerData,
     ) -> Transaction:
         args = arguments if arguments else []
         if should_prepare_args:
@@ -206,16 +192,16 @@ def prepare_upgrade_transaction(
         tx.nonce = nonce
         tx.version = version
         tx.options = options
-        tx.guardian = guardian_address
-        tx.relayer = relayer_address
+        tx.guardian = guardian_and_relayer_data.guardian_address
+        tx.relayer = guardian_and_relayer_data.relayer_address
 
         self.sign_transaction(
             transaction=tx,
             sender=owner,
-            guardian=guardian_account,
-            relayer=relayer_account,
-            guardian_service_url=guardian_service_url,
-            guardian_2fa_code=guardian_2fa_code,
+            guardian=guardian_and_relayer_data.guardian,
+            relayer=guardian_and_relayer_data.relayer,
+            guardian_service_url=guardian_and_relayer_data.guardian_service_url,
+            guardian_2fa_code=guardian_and_relayer_data.guardian_2fa_code,
         )
 
         return tx