multiversx-sdk-cli 7.0.0b0__tar.gz → 7.1.0__tar.gz

{multiversx_sdk_cli-7.0.0b0 → multiversx_sdk_cli-7.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: multiversx-sdk-cli
-Version: 7.0.0b0
+Version: 7.1.0
 Summary: MultiversX Smart Contracts Tools
 Project-URL: Homepage, https://github.com/multiversx/mx-sdk-py-cli
 Author: MultiversX
@@ -12,9 +12,9 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.8
 Requires-Dist: ledgercomm[hid]
-Requires-Dist: multiversx-sdk-core>=0.4.1
-Requires-Dist: multiversx-sdk-network-providers==0.6.*
-Requires-Dist: multiversx-sdk-wallet==0.6.*
+Requires-Dist: multiversx-sdk-core>=0.5.0
+Requires-Dist: multiversx-sdk-network-providers>=0.11.0
+Requires-Dist: multiversx-sdk-wallet>=0.7.0
 Requires-Dist: prettytable
 Requires-Dist: requests
 Requires-Dist: requests-cache

{multiversx_sdk_cli-7.0.0b0 → multiversx_sdk_cli-7.1.0}/multiversx_sdk_cli/cli_contracts.py

@@ -14,8 +14,7 @@ from multiversx_sdk_cli.contract_verification import \
     trigger_contract_verification
 from multiversx_sdk_cli.contracts import CodeMetadata, SmartContract
 from multiversx_sdk_cli.docker import is_docker_installed, run_docker
-from multiversx_sdk_cli.errors import DockerMissingError
-from multiversx_sdk_cli.projects import load_project
+from multiversx_sdk_cli.errors import DockerMissingError, NoWalletProvided
 from multiversx_sdk_cli.projects.core import get_project_paths_recursively
 from multiversx_sdk_cli.transactions import Transaction
 from multiversx_sdk_cli.cosign_transaction import cosign_transaction
@@ -71,7 +70,7 @@ def setup_parser(args: List[str], subparsers: Any) -> Any:
 
     output_description = CLIOutputBuilder.describe(with_contract=True, with_transaction_on_network=True, with_simulation=True)
     sub = cli_shared.add_command_subparser(subparsers, "contract", "deploy", f"Deploy a Smart Contract.{output_description}")
-    _add_project_or_bytecode_arg(sub)
+    _add_bytecode_arg(sub)
     _add_metadata_arg(sub)
     cli_shared.add_outfile_arg(sub)
     cli_shared.add_wallet_args(args, sub)
@@ -83,6 +82,7 @@ def setup_parser(args: List[str], subparsers: Any) -> Any:
     sub.add_argument("--timeout", default=100, help="max num of seconds to wait for result"
                                                     " - only valid if --wait-result is set")
     cli_shared.add_broadcast_args(sub)
+    cli_shared.add_guardian_wallet_args(args, sub)
 
     sub.set_defaults(func=deploy)
 
@@ -100,6 +100,7 @@ def setup_parser(args: List[str], subparsers: Any) -> Any:
     sub.add_argument("--timeout", default=100, help="max num of seconds to wait for result"
                                                     " - only valid if --wait-result is set")
     cli_shared.add_broadcast_args(sub, relay=True)
+    cli_shared.add_guardian_wallet_args(args, sub)
 
     sub.set_defaults(func=call)
 
@@ -107,7 +108,7 @@ def setup_parser(args: List[str], subparsers: Any) -> Any:
                                            f"Upgrade a previously-deployed Smart Contract.{output_description}")
     _add_contract_arg(sub)
     cli_shared.add_outfile_arg(sub)
-    _add_project_or_bytecode_arg(sub)
+    _add_bytecode_arg(sub)
     _add_metadata_arg(sub)
     cli_shared.add_wallet_args(args, sub)
     cli_shared.add_proxy_arg(sub)
@@ -118,6 +119,7 @@ def setup_parser(args: List[str], subparsers: Any) -> Any:
     sub.add_argument("--timeout", default=100, help="max num of seconds to wait for result"
                                                     " - only valid if --wait-result is set")
     cli_shared.add_broadcast_args(sub)
+    cli_shared.add_guardian_wallet_args(args, sub)
 
     sub.set_defaults(func=upgrade)
 
@@ -147,6 +149,7 @@ def setup_parser(args: List[str], subparsers: Any) -> Any:
         help="the url of the service that validates the contract",
     )
     sub.add_argument("--docker-image", required=True, help="the docker image used for the build")
+    sub.add_argument("--contract-variant", required=False, default=None, help="in case of a multicontract, specify the contract variant you want to verify")
     cli_shared.add_wallet_args(args, sub)
     sub.set_defaults(func=verify)
 
@@ -191,12 +194,9 @@ def _add_recursive_arg(sub: Any):
     sub.add_argument("-r", "--recursive", dest="recursive", action="store_true", help="locate projects recursively")
 
 
-def _add_project_or_bytecode_arg(sub: Any):
-    group = sub.add_mutually_exclusive_group(required=True)
-    group.add_argument("--project", default=os.getcwd(),
-                       help="🗀 the project directory (default: current directory)")
-    group.add_argument("--bytecode", type=str,
-                       help="the file containing the WASM bytecode")
+def _add_bytecode_arg(sub: Any):
+    sub.add_argument("--bytecode", type=str, required=True,
+                     help="the file containing the WASM bytecode")
 
 
 def _add_contract_arg(sub: Any):
@@ -285,7 +285,7 @@ def run_tests(args: Any):
 
 def deploy(args: Any):
     logger.debug("deploy")
-    cli_shared.check_guardian_args(args)
+    cli_shared.check_guardian_and_options_args(args)
     cli_shared.check_broadcast_args(args)
 
     arguments = args.arguments
@@ -299,9 +299,7 @@ def deploy(args: Any):
     sender = _prepare_sender(args)
 
     tx = contract.deploy(sender, arguments, gas_price, gas_limit, value, chain, version, args.guardian, args.options)
-
-    if args.guardian:
-        tx = cosign_transaction(tx, args.guardian_service_url, args.guardian_2fa_code)
+    tx = _sign_guarded_tx(args, tx)
 
     logger.info("Contract address: %s", contract.address)
     utils.log_explorer_contract_address(chain, contract.address)
@@ -310,12 +308,7 @@ def deploy(args: Any):
 
 
 def _prepare_contract(args: Any) -> SmartContract:
-    if args.bytecode and len(args.bytecode):
-        bytecode = utils.read_binary_file(Path(args.bytecode)).hex()
-    else:
-        project_path = Path(args.project)
-        project = load_project(project_path)
-        bytecode = project.get_bytecode()
+    bytecode = utils.read_binary_file(Path(args.bytecode)).hex()
 
     metadata = CodeMetadata(upgradeable=args.metadata_upgradeable, readable=args.metadata_readable,
                             payable=args.metadata_payable, payable_by_sc=args.metadata_payable_by_sc)
@@ -360,9 +353,28 @@ def _prepare_signer(args: Any) -> Account:
     return sender
 
 
+def _sign_guarded_tx(args: Any, tx: Transaction) -> Transaction:
+    signature = tx.signature
+    tx.signature = ""
+
+    try:
+        guardian_account = cli_shared.prepare_guardian_account(args)
+    except NoWalletProvided:
+        guardian_account = None
+
+    if guardian_account:
+        tx.guardianSignature = guardian_account.sign_transaction(tx)
+    elif args.guardian:
+        tx = cosign_transaction(tx, args.guardian_service_url, args.guardian_2fa_code)  # type: ignore
+
+    tx.signature = signature
+
+    return tx
+
+
 def call(args: Any):
     logger.debug("call")
-    cli_shared.check_guardian_args(args)
+    cli_shared.check_guardian_and_options_args(args)
     cli_shared.check_broadcast_args(args)
 
     contract_address = args.contract
@@ -378,9 +390,7 @@ def call(args: Any):
     sender = _prepare_sender(args)
 
     tx = contract.execute(sender, function, arguments, gas_price, gas_limit, value, chain, version, args.guardian, args.options)
-
-    if args.guardian:
-        tx = cosign_transaction(tx, args.guardian_service_url, args.guardian_2fa_code)
+    tx = _sign_guarded_tx(args, tx)
 
     _send_or_simulate(tx, contract, args)
 
@@ -401,10 +411,8 @@ def upgrade(args: Any):
     contract.address = Address(contract_address)
     sender = _prepare_sender(args)
 
-    tx = contract.upgrade(sender, arguments, gas_price, gas_limit, value, chain, version, args.guardian_address, args.options)
-
-    if args.guardian:
-        tx = cosign_transaction(tx, args.guardian_service_url, args.guardian_2fa_code)
+    tx = contract.upgrade(sender, arguments, gas_price, gas_limit, value, chain, version, args.guardian, args.options)
+    tx = _sign_guarded_tx(args, tx)
 
     _send_or_simulate(tx, contract, args)
 
@@ -435,9 +443,10 @@ def verify(args: Any) -> None:
 
     owner = _prepare_signer(args)
     docker_image = args.docker_image
+    contract_variant = args.contract_variant
 
     trigger_contract_verification(
-        packaged_src, owner, contract, verifier_url, docker_image
+        packaged_src, owner, contract, verifier_url, docker_image, contract_variant
     )
     logger.info("Contract verification request completed!")
 

{multiversx_sdk_cli-7.0.0b0 → multiversx_sdk_cli-7.1.0}/multiversx_sdk_cli/cli_delegation.py

@@ -134,10 +134,11 @@ def _add_common_arguments(args: List[str], sub: Any):
     cli_shared.add_tx_args(args, sub, with_receiver=False, with_data=False, with_estimate_gas=True, with_guardian=True)
     cli_shared.add_broadcast_args(sub, relay=False)
     cli_shared.add_outfile_arg(sub, what="signed transaction, hash")
+    cli_shared.add_guardian_wallet_args(args, sub)
 
 
 def do_create_delegation_contract(args: Any):
-    cli_shared.check_guardian_args(args)
+    cli_shared.check_guardian_and_options_args(args)
     cli_shared.check_broadcast_args(args)
     cli_shared.prepare_nonce_in_args(args)
     staking_provider.prepare_args_for_create_new_staking_contract(args)
@@ -161,7 +162,7 @@ def get_contract_address_by_deploy_tx_hash(args: Any):
 
 
 def add_new_nodes(args: Any):
-    cli_shared.check_guardian_args(args)
+    cli_shared.check_guardian_and_options_args(args)
     cli_shared.check_broadcast_args(args)
     cli_shared.prepare_nonce_in_args(args)
     staking_provider.prepare_args_for_add_nodes(args)
@@ -171,7 +172,7 @@ def add_new_nodes(args: Any):
 
 
 def remove_nodes(args: Any):
-    cli_shared.check_guardian_args(args)
+    cli_shared.check_guardian_and_options_args(args)
     cli_shared.check_broadcast_args(args)
     cli_shared.prepare_nonce_in_args(args)
     staking_provider.prepare_args_for_remove_nodes(args)
@@ -181,7 +182,7 @@ def remove_nodes(args: Any):
 
 
 def stake_nodes(args: Any):
-    cli_shared.check_guardian_args(args)
+    cli_shared.check_guardian_and_options_args(args)
     cli_shared.check_broadcast_args(args)
     cli_shared.prepare_nonce_in_args(args)
     staking_provider.prepare_args_for_stake_nodes(args)
@@ -191,7 +192,7 @@ def stake_nodes(args: Any):
 
 
 def unbond_nodes(args: Any):
-    cli_shared.check_guardian_args(args)
+    cli_shared.check_guardian_and_options_args(args)
     cli_shared.check_broadcast_args(args)
     cli_shared.prepare_nonce_in_args(args)
     staking_provider.prepare_args_for_unbond_nodes(args)
@@ -201,7 +202,7 @@ def unbond_nodes(args: Any):
 
 
 def unstake_nodes(args: Any):
-    cli_shared.check_guardian_args(args)
+    cli_shared.check_guardian_and_options_args(args)
     cli_shared.check_broadcast_args(args)
     cli_shared.prepare_nonce_in_args(args)
     staking_provider.prepare_args_for_unstake_nodes(args)
@@ -211,7 +212,7 @@ def unstake_nodes(args: Any):
 
 
 def unjail_nodes(args: Any):
-    cli_shared.check_guardian_args(args)
+    cli_shared.check_guardian_and_options_args(args)
     cli_shared.check_broadcast_args(args)
     cli_shared.prepare_nonce_in_args(args)
     staking_provider.prepare_args_for_unjail_nodes(args)
@@ -221,7 +222,7 @@ def unjail_nodes(args: Any):
 
 
 def change_service_fee(args: Any):
-    cli_shared.check_guardian_args(args)
+    cli_shared.check_guardian_and_options_args(args)
     cli_shared.check_broadcast_args(args)
     cli_shared.prepare_nonce_in_args(args)
     staking_provider.prepare_args_change_service_fee(args)
@@ -231,7 +232,7 @@ def change_service_fee(args: Any):
 
 
 def modify_delegation_cap(args: Any):
-    cli_shared.check_guardian_args(args)
+    cli_shared.check_guardian_and_options_args(args)
     cli_shared.check_broadcast_args(args)
     cli_shared.prepare_nonce_in_args(args)
     staking_provider.prepare_args_modify_delegation_cap(args)
@@ -241,7 +242,7 @@ def modify_delegation_cap(args: Any):
 
 
 def automatic_activation(args: Any):
-    cli_shared.check_guardian_args(args)
+    cli_shared.check_guardian_and_options_args(args)
     cli_shared.check_broadcast_args(args)
     cli_shared.prepare_nonce_in_args(args)
     staking_provider.prepare_args_automatic_activation(args)
@@ -251,7 +252,7 @@ def automatic_activation(args: Any):
 
 
 def redelegate_cap(args: Any):
-    cli_shared.check_guardian_args(args)
+    cli_shared.check_guardian_and_options_args(args)
     cli_shared.check_broadcast_args(args)
     cli_shared.prepare_nonce_in_args(args)
     staking_provider.prepare_args_redelegate_cap(args)
@@ -261,7 +262,7 @@ def redelegate_cap(args: Any):
 
 
 def set_metadata(args: Any):
-    cli_shared.check_guardian_args(args)
+    cli_shared.check_guardian_and_options_args(args)
     cli_shared.check_broadcast_args(args)
     cli_shared.prepare_nonce_in_args(args)
     staking_provider.prepare_args_set_metadata(args)

{multiversx_sdk_cli-7.0.0b0 → multiversx_sdk_cli-7.1.0}/multiversx_sdk_cli/cli_dns.py

@@ -18,6 +18,7 @@ def setup_parser(args: List[str], subparsers: Any) -> Any:
     cli_shared.add_wallet_args(args, sub)
     cli_shared.add_proxy_arg(sub)
     cli_shared.add_tx_args(args, sub, with_receiver=False, with_data=False, with_guardian=True)
+    cli_shared.add_guardian_wallet_args(args, sub)
     sub.add_argument("--name", help="the name to register")
     sub.set_defaults(func=register)
 

{multiversx_sdk_cli-7.0.0b0 → multiversx_sdk_cli-7.1.0}/multiversx_sdk_cli/cli_password.py

@@ -1,8 +1,16 @@
 from typing import Any
 from getpass import getpass
 
+
 def load_password(args: Any):
     if args.passfile:
         with open(args.passfile) as pass_file:
             return pass_file.read().strip()
     return getpass("Keyfile's password: ")
+
+
+def load_guardian_password(args: Any):
+    if args.guardian_passfile:
+        with open(args.guardian_passfile) as pass_file:
+            return pass_file.read().strip()
+    return getpass("Keyfile's password: ")

{multiversx_sdk_cli-7.0.0b0 → multiversx_sdk_cli-7.1.0}/multiversx_sdk_cli/cli_shared.py

@@ -10,7 +10,7 @@ from multiversx_sdk_network_providers.proxy_network_provider import \
 from multiversx_sdk_cli import config, errors, utils
 from multiversx_sdk_cli.accounts import Account
 from multiversx_sdk_cli.cli_output import CLIOutputBuilder
-from multiversx_sdk_cli.cli_password import load_password
+from multiversx_sdk_cli.cli_password import load_password, load_guardian_password
 from multiversx_sdk_cli.ledger.ledger_functions import do_get_ledger_address
 from multiversx_sdk_cli.simulation import Simulator
 from multiversx_sdk_cli.transactions import Transaction
@@ -79,13 +79,17 @@ def add_tx_args(args: List[str], sub: Any, with_nonce: bool = True, with_receive
     sub.add_argument("--version", type=int, default=config.get_tx_version(), help="the transaction version (default: %(default)s)")
 
     if with_guardian:
-        sub.add_argument("--guardian", type=str, help="the address of the guradian")
-        sub.add_argument("--guardian-service-url", type=str, help="the url of the guardian service")
-        sub.add_argument("--guardian-2fa-code", type=str, help="the 2fa code for the guardian")
+        add_guardian_args(sub)
 
     sub.add_argument("--options", type=int, default=0, help="the transaction options (default: 0)")
 
 
+def add_guardian_args(sub: Any):
+    sub.add_argument("--guardian", type=str, help="the address of the guradian")
+    sub.add_argument("--guardian-service-url", type=str, help="the url of the guardian service")
+    sub.add_argument("--guardian-2fa-code", type=str, help="the 2fa code for the guardian")
+
+
 def add_wallet_args(args: List[str], sub: Any):
     sub.add_argument("--pem", required=check_if_sign_method_required(args, "--pem"), help="🔑 the PEM file, if keyfile not provided")
     sub.add_argument("--pem-index", default=0, help="🔑 the index in the PEM file (default: %(default)s)")
@@ -97,6 +101,16 @@ def add_wallet_args(args: List[str], sub: Any):
     sub.add_argument("--sender-username", required=False, help="🖄 the username of the sender")
 
 
+def add_guardian_wallet_args(args: List[str], sub: Any):
+    sub.add_argument("--guardian-pem", required=check_if_sign_method_required(args, "--guardian-pem"), help="🔑 the PEM file, if keyfile not provided")
+    sub.add_argument("--guardian-pem-index", default=0, help="🔑 the index in the PEM file (default: %(default)s)")
+    sub.add_argument("--guardian-keyfile", required=check_if_sign_method_required(args, "--guardian-keyfile"), help="🔑 a JSON keyfile, if PEM not provided")
+    sub.add_argument("--guardian-passfile", help="🔑 a file containing keyfile's password, if keyfile provided")
+    sub.add_argument("--guardian-ledger", action="store_true", required=check_if_sign_method_required(args, "--guardian-ledger"), default=False, help="🔐 bool flag for signing transaction using ledger")
+    sub.add_argument("--guardian-ledger-account-index", type=int, default=0, help="🔐 the index of the account when using Ledger")
+    sub.add_argument("--guardian-ledger-address-index", type=int, default=0, help="🔐 the index of the address when using Ledger")
+
+
 def add_proxy_arg(sub: Any):
     sub.add_argument("--proxy", default=config.get_proxy(), help="🔗 the URL of the proxy (default: %(default)s)")
 
@@ -121,19 +135,39 @@ def parse_omit_fields_arg(args: Any) -> List[str]:
     return cast(List[str], parsed)
 
 
+def prepare_account(args: Any):
+    if args.pem:
+        account = Account(pem_file=args.pem, pem_index=args.pem_index)
+    elif args.keyfile:
+        password = load_password(args)
+        account = Account(key_file=args.keyfile, password=password)
+    elif args.ledger:
+        address = do_get_ledger_address(account_index=args.ledger_account_index, address_index=args.ledger_address_index)
+        account = Account(address=address)
+    else:
+        raise errors.NoWalletProvided()
+
+    return account
+
+
+def prepare_guardian_account(args: Any):
+    if args.guardian_pem:
+        account = Account(pem_file=args.guardian_pem, pem_index=args.guardian_pem_index)
+    elif args.guardian_keyfile:
+        password = load_guardian_password(args)
+        account = Account(key_file=args.guardian_keyfile, password=password)
+    elif args.guardian_ledger:
+        address = do_get_ledger_address(account_index=args.guardian_ledger_account_index, address_index=args.guardian_ledger_address_index)
+        account = Account(address=address)
+    else:
+        raise errors.NoWalletProvided()
+
+    return account
+
+
 def prepare_nonce_in_args(args: Any):
     if args.recall_nonce:
-        if args.pem:
-            account = Account(pem_file=args.pem, pem_index=args.pem_index)
-        elif args.keyfile:
-            password = load_password(args)
-            account = Account(key_file=args.keyfile, password=password)
-        elif args.ledger:
-            address = do_get_ledger_address(account_index=args.ledger_account_index, address_index=args.ledger_address_index)
-            account = Account(address=address)
-        else:
-            raise errors.NoWalletProvided()
-
+        account = prepare_account(args)
         account.sync_nonce(ProxyNetworkProvider(args.proxy))
         args.nonce = account.nonce
 
@@ -154,13 +188,32 @@ def check_broadcast_args(args: Any):
         raise errors.BadUsage("Cannot both 'simulate' and 'send' a transaction")
 
 
+def check_guardian_and_options_args(args: Any):
+    check_guardian_args(args)
+    if args.guardian:
+        check_options_for_guarded_tx(args.options)
+
+
 def check_guardian_args(args: Any):
-    if any([args.guardian, args.guardian_service_url, args.guardian_2fa_code]):
-        if not all([args.guardian, args.guardian_service_url, args.guardian_2fa_code]):
-            raise errors.BadUsage("All guardian arguments must be provided")
+    if args.guardian:
+        if should_sign_with_cosigner_service(args) and should_sign_with_guardian_key(args):
+            raise errors.BadUsage("Guarded tx should be signed using either a cosigning service or a guardian key")
+
+        if not should_sign_with_cosigner_service(args) and not should_sign_with_guardian_key(args):
+            raise errors.BadUsage("Missing guardian signing arguments")
+
+
+def should_sign_with_cosigner_service(args: Any) -> bool:
+    return all([args.guardian_service_url, args.guardian_2fa_code])
+
+
+def should_sign_with_guardian_key(args: Any) -> bool:
+    return any([args.guardian_pem, args.guardian_keyfile, args.guardian_ledger])
+
 
-        if not args.options & TRANSACTION_OPTIONS_TX_GUARDED == TRANSACTION_OPTIONS_TX_GUARDED:
-            raise errors.BadUsage("For guarded transactions the guarded flag must be set.")
+def check_options_for_guarded_tx(options: int):
+    if not options & TRANSACTION_OPTIONS_TX_GUARDED == TRANSACTION_OPTIONS_TX_GUARDED:
+        raise errors.BadUsage("Invalid guarded transaction's options. The second least significant bit must be set.")
 
 
 def send_or_simulate(tx: Transaction, args: Any, dump_output: bool = True) -> CLIOutputBuilder:

{multiversx_sdk_cli-7.0.0b0 → multiversx_sdk_cli-7.1.0}/multiversx_sdk_cli/cli_transactions.py

@@ -4,7 +4,9 @@ from typing import Any, List
 from multiversx_sdk_cli import cli_shared, utils
 from multiversx_sdk_cli.cli_output import CLIOutputBuilder
 from multiversx_sdk_network_providers.proxy_network_provider import ProxyNetworkProvider
+from multiversx_sdk_cli.errors import NoWalletProvided
 from multiversx_sdk_cli.transactions import Transaction, do_prepare_transaction
+from multiversx_sdk_cli.cosign_transaction import cosign_transaction
 
 
 def setup_parser(args: List[str], subparsers: Any) -> Any:
@@ -16,6 +18,7 @@ def setup_parser(args: List[str], subparsers: Any) -> Any:
     cli_shared.add_outfile_arg(sub, what="signed transaction, hash")
     cli_shared.add_broadcast_args(sub, relay=True)
     cli_shared.add_proxy_arg(sub)
+    cli_shared.add_guardian_wallet_args(args, sub)
     sub.add_argument("--wait-result", action="store_true", default=False,
                      help="signal to wait for the transaction result - only valid if --send is set")
     sub.add_argument("--timeout", default=100, help="max num of seconds to wait for result"
@@ -36,6 +39,16 @@ def setup_parser(args: List[str], subparsers: Any) -> Any:
     cli_shared.add_omit_fields_arg(sub)
     sub.set_defaults(func=get_transaction)
 
+    sub = cli_shared.add_command_subparser(subparsers, "tx", "sign", f"Sign a previously saved transaction.{CLIOutputBuilder.describe()}")
+    cli_shared.add_wallet_args(args, sub)
+    cli_shared.add_infile_arg(sub, what="a previously saved transaction")
+    cli_shared.add_outfile_arg(sub, what="the signed transaction")
+    cli_shared.add_broadcast_args(sub, relay=True)
+    cli_shared.add_proxy_arg(sub)
+    cli_shared.add_guardian_args(sub)
+    cli_shared.add_guardian_wallet_args(args, sub)
+    sub.set_defaults(func=sign_transaction)
+
     parser.epilog = cli_shared.build_group_epilog(subparsers)
     return subparsers
 
@@ -49,7 +62,7 @@ def _add_common_arguments(args: List[str], sub: Any):
 def create_transaction(args: Any):
     args = utils.as_object(args)
 
-    cli_shared.check_guardian_args(args)
+    cli_shared.check_guardian_and_options_args(args)
     cli_shared.check_broadcast_args(args)
     cli_shared.prepare_nonce_in_args(args)
 
@@ -85,3 +98,35 @@ def get_transaction(args: Any):
     transaction = proxy.get_transaction(args.hash)
     output = CLIOutputBuilder().set_transaction_on_network(transaction, omit_fields).build()
     utils.dump_out_json(output)
+
+
+def sign_transaction(args: Any):
+    args = utils.as_object(args)
+
+    cli_shared.check_guardian_args(args)
+    cli_shared.check_broadcast_args(args)
+
+    tx = Transaction.load_from_file(args.infile)
+    if args.guardian:
+        cli_shared.check_options_for_guarded_tx(tx.options)
+
+    # clear existing signatures, if any
+    tx.guardianSignature = ""
+    tx.signature = ""
+
+    account = cli_shared.prepare_account(args)
+    signature = account.sign_transaction(tx)
+
+    try:
+        guardian_account = cli_shared.prepare_guardian_account(args)
+    except NoWalletProvided:
+        guardian_account = None
+
+    if guardian_account:
+        tx.guardianSignature = guardian_account.sign_transaction(tx)
+    elif args.guardian:
+        tx = cosign_transaction(tx, args.guardian_service_url, args.guardian_2fa_code)
+
+    tx.signature = signature
+
+    cli_shared.send_or_simulate(tx, args)

{multiversx_sdk_cli-7.0.0b0 → multiversx_sdk_cli-7.1.0}/multiversx_sdk_cli/cli_validators.py

@@ -91,6 +91,7 @@ def _add_common_arguments(args: List[str], sub: Any):
     cli_shared.add_tx_args(args, sub, with_receiver=False, with_data=False, with_estimate_gas=True, with_guardian=True)
     cli_shared.add_broadcast_args(sub, relay=False)
     cli_shared.add_outfile_arg(sub, what="signed transaction, hash")
+    cli_shared.add_guardian_wallet_args(args, sub)
 
 
 def _add_nodes_arg(sub: Any):

{multiversx_sdk_cli-7.0.0b0 → multiversx_sdk_cli-7.1.0}/multiversx_sdk_cli/contract_verification.py

@@ -3,7 +3,7 @@ import json
 import logging
 import time
 from pathlib import Path
-from typing import Any, Dict, Tuple
+from typing import Any, Dict, Tuple, Optional
 
 import requests
 
@@ -24,11 +24,13 @@ class ContractVerificationRequest:
         source_code: Dict[str, Any],
         signature: bytes,
         docker_image: str,
+        contract_variant: Optional[str]
     ) -> None:
         self.contract = contract
         self.source_code = source_code
         self.signature = signature
         self.docker_image = docker_image
+        self.contract_variant = contract_variant
 
     def to_dictionary(self) -> Dict[str, Any]:
         return {
@@ -36,39 +38,42 @@ class ContractVerificationRequest:
             "payload": {
                 "contract": self.contract.bech32(),
                 "dockerImage": self.docker_image,
-                "sourceCode": self.source_code
+                "sourceCode": self.source_code,
+                "contractVariant": self.contract_variant
             }
         }
 
 
 class ContractVerificationPayload:
-    def __init__(self, contract: Address, source_code: Dict[str, Any], docker_image: str,) -> None:
+    def __init__(self, contract: Address, source_code: Dict[str, Any], docker_image: str, contract_variant: Optional[str]) -> None:
         self.contract = contract
         self.source_code = source_code
         self.docker_image = docker_image
+        self.contract_variant = contract_variant
 
-    def serialize(self):
+    def serialize(self) -> str:
         payload = {
             "contract": self.contract.bech32(),
             "dockerImage": self.docker_image,
-            "sourceCode": self.source_code
+            "sourceCode": self.source_code,
+            "contractVariant": self.contract_variant
         }
 
         return json.dumps(payload, separators=(',', ':'))
 
 
 def trigger_contract_verification(
-    packaged_source: Path,
-    owner: Account,
-    contract: Address,
-    verifier_url: str,
-    docker_image: str,
-):
+        packaged_source: Path,
+        owner: Account,
+        contract: Address,
+        verifier_url: str,
+        docker_image: str,
+        contract_variant: Optional[str]):
     source_code = read_json_file(packaged_source)
 
-    payload = ContractVerificationPayload(contract, source_code, docker_image).serialize()
+    payload = ContractVerificationPayload(contract, source_code, docker_image, contract_variant).serialize()
     signature = _create_request_signature(owner, contract, payload.encode())
-    contract_verification = ContractVerificationRequest(contract, source_code, signature, docker_image)
+    contract_verification = ContractVerificationRequest(contract, source_code, signature, docker_image, contract_variant)
 
     request_dictionary = contract_verification.to_dictionary()
 
@@ -100,7 +105,7 @@ def _create_request_signature(account: Account, contract_address: Address, reque
     raw_data_to_sign = f"{contract_address.bech32()}{hashed_payload}"
 
     signature_hex = account.sign_message(raw_data_to_sign.encode())
-    signature: bytes = bytes.fromhex(signature_hex)
+    signature = bytes.fromhex(signature_hex)
 
     return signature