Merge branch 'feat/next' into environment-config

Author: popenta

multiversx_sdk_cli/base_transactions_controller.py

@@ -22,7 +22,7 @@
 )
 from multiversx_sdk_cli.cosign_transaction import cosign_transaction
 from multiversx_sdk_cli.env import get_address_hrp
-from multiversx_sdk_cli.errors import BadUserInput
+from multiversx_sdk_cli.errors import BadUserInput, TransactionSigningError
 from multiversx_sdk_cli.guardian_relayer_data import GuardianRelayerData
 from multiversx_sdk_cli.interfaces import IAccount
 
@@ -47,7 +47,10 @@ def sign_transaction(
         self._set_options_for_hash_signing_if_needed(transaction, sender, guardian, relayer)
 
         if sender:
-            transaction.signature = sender.sign_transaction(transaction)
+            try:
+                transaction.signature = sender.sign_transaction(transaction)
+            except Exception as e:
+                raise TransactionSigningError(f"Could not sign transaction: {str(e)}")
 
         self._sign_guarded_transaction_if_guardian(
             transaction,
@@ -94,15 +97,21 @@ def _sign_guarded_transaction_if_guardian(
     ) -> Transaction:
         #  If the guardian account is provided, we sign locally. Otherwise, we reach for the trusted cosign service.
         if guardian:
-            transaction.guardian_signature = guardian.sign_transaction(transaction)
+            try:
+                transaction.guardian_signature = guardian.sign_transaction(transaction)
+            except Exception as e:
+                raise TransactionSigningError(f"Could not sign transaction: {str(e)}")
         elif transaction.guardian and guardian_service_url and guardian_2fa_code:
             cosign_transaction(transaction, guardian_service_url, guardian_2fa_code)
 
         return transaction
 
     def _sign_relayed_transaction_if_relayer(self, transaction: Transaction, relayer: Union[IAccount, None]):
         if relayer and transaction.relayer:
-            transaction.relayer_signature = relayer.sign_transaction(transaction)
+            try:
+                transaction.relayer_signature = relayer.sign_transaction(transaction)
+            except Exception as e:
+                raise TransactionSigningError(f"Could not sign transaction: {str(e)}")
 
     def _convert_args_to_typed_values(self, arguments: list[str]) -> list[Any]:
         args: list[Any] = []

multiversx_sdk_cli/cli_shared.py

@@ -37,6 +37,7 @@
     ArgumentsNotProvidedError,
     BadUsage,
     IncorrectWalletError,
+    LedgerError,
 )
 from multiversx_sdk_cli.guardian_relayer_data import GuardianRelayerData
 from multiversx_sdk_cli.interfaces import IAccount
@@ -353,7 +354,10 @@ def prepare_account(args: Any):
             hrp=hrp,
         )
     elif args.ledger:
-        return LedgerAccount(address_index=args.sender_wallet_index)
+        try:
+            return LedgerAccount(address_index=args.sender_wallet_index)
+        except Exception as e:
+            raise LedgerError(str(e))
     else:
         raise errors.NoWalletProvided()
 
@@ -409,7 +413,10 @@ def load_guardian_account(args: Any) -> Union[IAccount, None]:
             hrp=hrp,
         )
     elif args.guardian_ledger:
-        return LedgerAccount(address_index=args.guardian_wallet_index)
+        try:
+            return LedgerAccount(address_index=args.guardian_wallet_index)
+        except Exception as e:
+            raise LedgerError(str(e))
 
     return None
 
@@ -540,7 +547,10 @@ def load_relayer_account(args: Any) -> Union[IAccount, None]:
             hrp=hrp,
         )
     elif args.relayer_ledger:
-        return LedgerAccount(address_index=args.relayer_wallet_index)
+        try:
+            return LedgerAccount(address_index=args.relayer_wallet_index)
+        except Exception as e:
+            raise LedgerError(str(e))
 
     return None
 

multiversx_sdk_cli/errors.py

@@ -151,6 +151,16 @@ def __init__(self, message: str):
         super().__init__(message)
 
 
+class LedgerError(KnownError):
+    def __init__(self, message: str):
+        super().__init__(message)
+
+
+class TransactionSigningError(KnownError):
+    def __init__(self, message: str):
+        super().__init__(message)
+
+
 class InvalidConfirmationSettingError(KnownError):
     def __init__(self, value: str):
         super().__init__(