Merge pull request #495 from multiversx/improve-guarded-accounts-flow

Improve flow for guarded accounts

Author: popenta

multiversx_sdk_cli/base_transactions_controller.py

@@ -2,6 +2,10 @@
 
 from multiversx_sdk import LedgerAccount, Transaction, TransactionComputer
 
+from multiversx_sdk_cli.constants import (
+    EXTRA_GAS_LIMIT_FOR_GUARDED_TRANSACTIONS,
+    EXTRA_GAS_LIMIT_FOR_RELAYED_TRANSACTIONS,
+)
 from multiversx_sdk_cli.cosign_transaction import cosign_transaction
 from multiversx_sdk_cli.interfaces import IAccount
 
@@ -16,8 +20,8 @@ def sign_transaction(
         sender: Optional[IAccount] = None,
         guardian: Optional[IAccount] = None,
         relayer: Optional[IAccount] = None,
-        guardian_service_url: str = "",
-        guardian_2fa_code: str = "",
+        guardian_service_url: Optional[str] = None,
+        guardian_2fa_code: Optional[str] = None,
     ):
         """Signs the transaction using the sender's account and, if required, additionally signs with the guardian's and relayer's accounts. Ensures the appropriate transaction options are set as needed."""
         self._set_options_for_guarded_transaction_if_needed(transaction)
@@ -34,6 +38,14 @@ def sign_transaction(
         )
         self._sign_relayed_transaction_if_relayer(transaction, relayer)
 
+    def add_extra_gas_limit_if_required(self, transaction: Transaction):
+        """In case of guarded or relayed transactions, extra gas limit is added."""
+        if transaction.guardian:
+            transaction.gas_limit += EXTRA_GAS_LIMIT_FOR_GUARDED_TRANSACTIONS
+
+        if transaction.relayer:
+            transaction.gas_limit += EXTRA_GAS_LIMIT_FOR_RELAYED_TRANSACTIONS
+
     def _set_options_for_guarded_transaction_if_needed(self, transaction: Transaction):
         if transaction.guardian:
             transaction_computer = TransactionComputer()
@@ -58,8 +70,8 @@ def _sign_guarded_transaction_if_guardian(
         self,
         transaction: Transaction,
         guardian: Union[IAccount, None],
-        guardian_service_url: str,
-        guardian_2fa_code: str,
+        guardian_service_url: Union[str, None],
+        guardian_2fa_code: Union[str, None],
     ) -> Transaction:
         #  If the guardian account is provided, we sign locally. Otherwise, we reach for the trusted cosign service.
         if guardian: