multiversx-sdk-cli 9.10.0__tar.gz → 9.10.2__tar.gz

{multiversx_sdk_cli-9.10.0 → multiversx_sdk_cli-9.10.2}/PKG-INFO

@@ -1,10 +1,11 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: multiversx-sdk-cli
-Version: 9.10.0
+Version: 9.10.2
 Summary: MultiversX Smart Contracts Tools
 Project-URL: Homepage, https://github.com/multiversx/mx-sdk-py-cli
 Author: MultiversX
-License: MIT
+License-Expression: MIT
+License-File: LICENSE
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
@@ -31,7 +32,7 @@ Python Command Line Tools for interacting with Multivers<sup>X</sup>.
 [CLI](CLI.md)
 
 ## Distribution
-[mxpy-up](https://docs.multiversx.com/sdk-and-tools/sdk-py/installing-mxpy/) and [PyPi](https://pypi.org/project/multiversx-sdk-cli/#history)
+[pipx](https://docs.multiversx.com/sdk-and-tools/sdk-py/installing-mxpy/) [(PyPi)](https://pypi.org/project/multiversx-sdk-cli/#history)
 
 ## Development setup
 

{multiversx_sdk_cli-9.10.0 → multiversx_sdk_cli-9.10.2}/README.md

@@ -8,7 +8,7 @@ Python Command Line Tools for interacting with Multivers<sup>X</sup>.
 [CLI](CLI.md)
 
 ## Distribution
-[mxpy-up](https://docs.multiversx.com/sdk-and-tools/sdk-py/installing-mxpy/) and [PyPi](https://pypi.org/project/multiversx-sdk-cli/#history)
+[pipx](https://docs.multiversx.com/sdk-and-tools/sdk-py/installing-mxpy/) [(PyPi)](https://pypi.org/project/multiversx-sdk-cli/#history)
 
 ## Development setup
 

{multiversx_sdk_cli-9.10.0 → multiversx_sdk_cli-9.10.2}/multiversx_sdk_cli/accounts.py

@@ -96,6 +96,8 @@ class LedgerAccount(Account):
     def sign_transaction(self, transaction: ITransaction) -> str:
         ledger_version = do_get_ledger_version()
         should_use_hash_signing = compare_versions(ledger_version, SIGN_USING_HASH_VERSION) >= 0
+
+        # TODO: This check will be removed in the next major release.
         if should_use_hash_signing:
             transaction.version = TX_HASH_SIGN_VERSION
             transaction.options = transaction.options | TX_HASH_SIGN_OPTIONS

{multiversx_sdk_cli-9.10.0 → multiversx_sdk_cli-9.10.2}/multiversx_sdk_cli/cosign_transaction.py

@@ -1,4 +1,4 @@
-from typing import Any, Dict
+from typing import Any
 
 import requests
 from multiversx_sdk import TransactionsConverter
@@ -11,20 +11,22 @@ def cosign_transaction(transaction: ITransaction, service_url: str, guardian_cod
     tx_converter = TransactionsConverter()
     payload = {
         "code": f"{guardian_code}",
-        "transaction": tx_converter.transaction_to_dictionary(transaction)
+        "transactions": [tx_converter.transaction_to_dictionary(transaction)]
     }
 
-    url = f"{service_url}/sign-transaction"
+    # we call sign-multiple-transactions to be allowed a bigger payload (e.g. deploying large contracts)
+    url = f"{service_url}/sign-multiple-transactions"
     response = requests.post(url, json=payload)
     check_for_guardian_error(response.json())
 
-    tx_as_dict = response.json()["data"]["transaction"]
+    # we only send 1 transaction
+    tx_as_dict = response.json()["data"]["transactions"][0]
     transaction.guardian_signature = bytes.fromhex(tx_as_dict["guardianSignature"])
 
     return transaction
 
 
-def check_for_guardian_error(response: Dict[str, Any]):
+def check_for_guardian_error(response: dict[str, Any]):
     error = response["error"]
 
     if error:

{multiversx_sdk_cli-9.10.0 → multiversx_sdk_cli-9.10.2}/multiversx_sdk_cli/transactions.py

@@ -2,15 +2,15 @@ import base64
 import json
 import logging
 import time
-from typing import Any, Dict, List, Optional, Protocol, TextIO
+from typing import Any, Dict, List, Optional, Protocol, TextIO, Union
 
 from multiversx_sdk import (Address, Token, TokenComputer, TokenTransfer,
                             Transaction, TransactionsConverter,
                             TransactionsFactoryConfig,
-                            TransferTransactionsFactory)
+                            TransferTransactionsFactory, TransactionComputer)
 
 from multiversx_sdk_cli import errors
-from multiversx_sdk_cli.accounts import Account, LedgerAccount
+from multiversx_sdk_cli.accounts import Account, AccountBase, LedgerAccount
 from multiversx_sdk_cli.cli_password import (load_guardian_password,
                                              load_password)
 from multiversx_sdk_cli.cosign_transaction import cosign_transaction
@@ -75,6 +75,10 @@ def do_prepare_transaction(args: Any) -> Transaction:
     tx.version = int(args.version)
     tx.options = int(args.options)
 
+    tx_computer = TransactionComputer()
+    if isinstance(account, LedgerAccount):
+        tx_computer.apply_options_for_hash_signing(tx)
+
     if args.guardian:
         tx.guardian = args.guardian
 
@@ -86,14 +90,25 @@ def do_prepare_transaction(args: Any) -> Transaction:
             if relayer_account.address.to_bech32() != tx.relayer:
                 raise IncorrectWalletError("")
 
+            if isinstance(relayer_account, LedgerAccount):
+                tx_computer.apply_options_for_hash_signing(tx)
+
             tx.relayer_signature = bytes.fromhex(relayer_account.sign_transaction(tx))
         except NoWalletProvided:
             logger.warning("Relayer wallet not provided. Transaction will not be signed by relayer.")
         except IncorrectWalletError:
             raise IncorrectWalletError("Relayer wallet does not match the relayer's address set in the transaction.")
 
+    try:
+        guardian_account = get_guardian_account_from_args(args)
+        if isinstance(guardian_account, LedgerAccount):
+            tx_computer.apply_options_for_hash_signing(tx)
+
+    except NoWalletProvided:
+        guardian_account = None
+
     tx.signature = bytes.fromhex(account.sign_transaction(tx))
-    tx = sign_tx_by_guardian(args, tx)
+    tx = sign_tx_by_guardian(args, tx, guardian_account)
 
     return tx
 
@@ -141,12 +156,7 @@ def prepare_token_transfers(transfers: List[Any]) -> List[TokenTransfer]:
     return token_transfers
 
 
-def sign_tx_by_guardian(args: Any, tx: Transaction) -> Transaction:
-    try:
-        guardian_account = get_guardian_account_from_args(args)
-    except NoWalletProvided:
-        guardian_account = None
-
+def sign_tx_by_guardian(args: Any, tx: Transaction, guardian_account: Union[AccountBase, None]) -> Transaction:
     if guardian_account:
         tx.guardian_signature = bytes.fromhex(guardian_account.sign_transaction(tx))
     elif args.guardian:

{multiversx_sdk_cli-9.10.0 → multiversx_sdk_cli-9.10.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "multiversx-sdk-cli"
-version = "9.10.0"
+version = "9.10.2"
 authors = [
   { name="MultiversX" },
 ]