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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: multiversx-sdk-cli
-Version: 9.9.0
+Version: 9.10.0
 Summary: MultiversX Smart Contracts Tools
 Project-URL: Homepage, https://github.com/multiversx/mx-sdk-py-cli
 Author: MultiversX

{multiversx_sdk_cli-9.9.0 → multiversx_sdk_cli-9.10.0}/multiversx_sdk_cli/cli_shared.py

@@ -68,7 +68,8 @@ def add_tx_args(
         with_nonce: bool = True,
         with_receiver: bool = True,
         with_data: bool = True,
-        with_estimate_gas: bool = False):
+        with_estimate_gas: bool = False,
+        with_relayer_wallet_args: bool = True):
     if with_nonce:
         sub.add_argument("--nonce", type=int, required=not ("--recall-nonce" in args), help="# the nonce for the transaction")
         sub.add_argument("--recall-nonce", action="store_true", default=False, help="⭮ whether to recall the nonce when creating the transaction (default: %(default)s)")
@@ -90,6 +91,10 @@ def add_tx_args(
     sub.add_argument("--chain", help="the chain identifier")
     sub.add_argument("--version", type=int, default=DEFAULT_TX_VERSION, help="the transaction version (default: %(default)s)")
 
+    sub.add_argument("--relayer", help="the bech32 address of the relayer")
+    if with_relayer_wallet_args:
+        add_relayed_v3_wallet_args(args, sub)
+
     add_guardian_args(sub)
 
     sub.add_argument("--options", type=int, default=0, help="the transaction options (default: 0)")
@@ -122,6 +127,17 @@ def add_guardian_wallet_args(args: List[str], sub: Any):
     sub.add_argument("--guardian-ledger-address-index", type=int, default=0, help="🔐 the index of the address when using Ledger")
 
 
+# Required check not properly working, same for guardian. Will be refactored in the future.
+def add_relayed_v3_wallet_args(args: List[str], sub: Any):
+    sub.add_argument("--relayer-pem", help="🔑 the PEM file, if keyfile not provided")
+    sub.add_argument("--relayer-pem-index", type=int, default=0, help="🔑 the index in the PEM file (default: %(default)s)")
+    sub.add_argument("--relayer-keyfile", help="🔑 a JSON keyfile, if PEM not provided")
+    sub.add_argument("--relayer-passfile", help="🔑 a file containing keyfile's password, if keyfile provided")
+    sub.add_argument("--relayer-ledger", action="store_true", default=False, help="🔐 bool flag for signing transaction using ledger")
+    sub.add_argument("--relayer-ledger-account-index", type=int, default=0, help="🔐 the index of the account when using Ledger")
+    sub.add_argument("--relayer-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", help="🔗 the URL of the proxy")
 
@@ -166,6 +182,20 @@ def prepare_account(args: Any):
     return account
 
 
+def prepare_relayer_account(args: Any) -> Account:
+    if args.relayer_ledger:
+        account = LedgerAccount(account_index=args.relayer_ledger_account_index, address_index=args.relayer_ledger_address_index)
+    if args.relayer_pem:
+        account = Account(pem_file=args.relayer_pem, pem_index=args.relayer_pem_index)
+    elif args.relayer_keyfile:
+        password = load_password(args)
+        account = Account(key_file=args.relayer_keyfile, password=password)
+    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)

{multiversx_sdk_cli-9.9.0 → multiversx_sdk_cli-9.10.0}/multiversx_sdk_cli/cli_transactions.py

@@ -8,7 +8,7 @@ from multiversx_sdk_cli import cli_shared, utils
 from multiversx_sdk_cli.cli_output import CLIOutputBuilder
 from multiversx_sdk_cli.config import get_config_for_network_providers
 from multiversx_sdk_cli.cosign_transaction import cosign_transaction
-from multiversx_sdk_cli.errors import NoWalletProvided
+from multiversx_sdk_cli.errors import IncorrectWalletError, NoWalletProvided
 from multiversx_sdk_cli.transactions import (compute_relayed_v1_data,
                                              do_prepare_transaction,
                                              load_transaction_from_file)
@@ -57,6 +57,14 @@ def setup_parser(args: List[str], subparsers: Any) -> Any:
     cli_shared.add_guardian_wallet_args(args, sub)
     sub.set_defaults(func=sign_transaction)
 
+    sub = cli_shared.add_command_subparser(subparsers, "tx", "relay", f"Relay a previously saved transaction.{CLIOutputBuilder.describe()}")
+    cli_shared.add_relayed_v3_wallet_args(args, sub)
+    cli_shared.add_infile_arg(sub, what="a previously saved transaction")
+    cli_shared.add_outfile_arg(sub, what="the relayer signed transaction")
+    cli_shared.add_broadcast_args(sub)
+    cli_shared.add_proxy_arg(sub)
+    sub.set_defaults(func=relay_transaction)
+
     parser.epilog = cli_shared.build_group_epilog(subparsers)
     return subparsers
 
@@ -141,3 +149,26 @@ def sign_transaction(args: Any):
         tx = cosign_transaction(tx, args.guardian_service_url, args.guardian_2fa_code)
 
     cli_shared.send_or_simulate(tx, args)
+
+
+def relay_transaction(args: Any):
+    args = utils.as_object(args)
+
+    if not _is_relayer_wallet_provided(args):
+        raise NoWalletProvided()
+
+    cli_shared.check_broadcast_args(args)
+
+    tx = load_transaction_from_file(args.infile)
+    relayer = cli_shared.prepare_relayer_account(args)
+
+    if tx.relayer != relayer.address.to_bech32():
+        raise IncorrectWalletError("Relayer wallet does not match the relayer's address set in the transaction.")
+
+    tx.relayer_signature = bytes.fromhex(relayer.sign_transaction(tx))
+
+    cli_shared.send_or_simulate(tx, args)
+
+
+def _is_relayer_wallet_provided(args: Any):
+    return any([args.relayer_pem, args.relayer_keyfile, args.relayer_ledger])

{multiversx_sdk_cli-9.9.0 → multiversx_sdk_cli-9.10.0}/multiversx_sdk_cli/delegation/staking_provider.py

@@ -5,6 +5,7 @@ from multiversx_sdk import (Address, DelegationTransactionsFactory,
                             Transaction, ValidatorPublicKey)
 from multiversx_sdk.core.serializer import args_to_string
 
+from multiversx_sdk_cli.config import get_address_hrp
 from multiversx_sdk_cli.errors import BadUsage
 from multiversx_sdk_cli.interfaces import IAddress, ITransaction
 from multiversx_sdk_cli.validators.validators_file import ValidatorsFile
@@ -408,7 +409,7 @@ class DelegationOperations:
         return tx
 
     def prepare_transaction_for_creating_delegation_contract_from_validator(self, owner: IAccount, args: Any) -> ITransaction:
-        receiver = "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqylllslmq6y6"
+        receiver = Address.new_from_hex("000000000000000000010000000000000000000000000000000000000004ffff", get_address_hrp()).to_bech32()
         max_cap = int(args.max_cap)
         fee = int(args.fee)
         data = "makeNewContractFromValidatorData@" + args_to_string([max_cap, fee])

{multiversx_sdk_cli-9.9.0 → multiversx_sdk_cli-9.10.0}/multiversx_sdk_cli/errors.py

@@ -182,3 +182,8 @@ class QueryContractError(KnownError):
 class NativeAuthClientError(KnownError):
     def __init__(self, message: str):
         super().__init__(message)
+
+
+class IncorrectWalletError(KnownError):
+    def __init__(self, message: str):
+        super().__init__(message)

{multiversx_sdk_cli-9.9.0 → multiversx_sdk_cli-9.10.0}/multiversx_sdk_cli/interfaces.py

@@ -25,6 +25,8 @@ class ITransaction(Protocol):
     guardian: str
     signature: bytes
     guardian_signature: bytes
+    relayer: str
+    relayer_signature: bytes
 
 
 class IAccount(Protocol):

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

@@ -14,7 +14,7 @@ from multiversx_sdk_cli.accounts import Account, LedgerAccount
 from multiversx_sdk_cli.cli_password import (load_guardian_password,
                                              load_password)
 from multiversx_sdk_cli.cosign_transaction import cosign_transaction
-from multiversx_sdk_cli.errors import NoWalletProvided
+from multiversx_sdk_cli.errors import IncorrectWalletError, NoWalletProvided
 from multiversx_sdk_cli.interfaces import ITransaction
 from multiversx_sdk_cli.ledger.ledger_functions import do_get_ledger_address
 
@@ -78,6 +78,20 @@ def do_prepare_transaction(args: Any) -> Transaction:
     if args.guardian:
         tx.guardian = args.guardian
 
+    if args.relayer:
+        tx.relayer = args.relayer
+
+        try:
+            relayer_account = load_relayer_account_from_args(args)
+            if relayer_account.address.to_bech32() != tx.relayer:
+                raise IncorrectWalletError("")
+
+            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.")
+
     tx.signature = bytes.fromhex(account.sign_transaction(tx))
     tx = sign_tx_by_guardian(args, tx)
 
@@ -97,6 +111,20 @@ def load_sender_account_from_args(args: Any) -> Account:
     return account
 
 
+def load_relayer_account_from_args(args: Any) -> Account:
+    if args.relayer_ledger:
+        account = LedgerAccount(account_index=args.relayer_ledger_account_index, address_index=args.relayer_ledger_address_index)
+    if args.relayer_pem:
+        account = Account(pem_file=args.relayer_pem, pem_index=args.relayer_pem_index)
+    elif args.relayer_keyfile:
+        password = load_password(args)
+        account = Account(key_file=args.relayer_keyfile, password=password)
+    else:
+        raise errors.NoWalletProvided()
+
+    return account
+
+
 def prepare_token_transfers(transfers: List[Any]) -> List[TokenTransfer]:
     token_computer = TokenComputer()
     token_transfers: List[TokenTransfer] = []

{multiversx_sdk_cli-9.9.0 → multiversx_sdk_cli-9.10.0}/multiversx_sdk_cli/validators/core.py

@@ -8,14 +8,14 @@ from multiversx_sdk_cli import utils
 from multiversx_sdk_cli.accounts import Account
 from multiversx_sdk_cli.cli_password import load_password
 from multiversx_sdk_cli.config import (GAS_PER_DATA_BYTE, MIN_GAS_LIMIT,
-                                       MetaChainSystemSCsCost)
+                                       MetaChainSystemSCsCost, get_address_hrp)
 from multiversx_sdk_cli.contracts import prepare_execute_transaction_data
 from multiversx_sdk_cli.errors import BadUsage
 from multiversx_sdk_cli.validators.validators_file import ValidatorsFile
 
 logger = logging.getLogger("validators")
 
-VALIDATORS_SMART_CONTRACT_ADDRESS = "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqplllst77y4l"
+VALIDATORS_SMART_CONTRACT_ADDRESS_HEX = "000000000000000000010000000000000000000000000000000000000001ffff"
 
 
 def prepare_args_for_stake(args: Any):
@@ -36,7 +36,7 @@ def prepare_args_for_stake(args: Any):
 
     data, gas_limit = prepare_transaction_data_for_stake(node_operator.address, validators_file_path, reward_address)
     args.data = data
-    args.receiver = VALIDATORS_SMART_CONTRACT_ADDRESS
+    args.receiver = Address.new_from_hex(VALIDATORS_SMART_CONTRACT_ADDRESS_HEX, get_address_hrp()).to_bech32()
 
     if args.estimate_gas:
         args.gas_limit = gas_limit
@@ -74,7 +74,7 @@ def prepare_transaction_data_for_stake(node_operator_address: Address, validator
 
 def prepare_args_for_top_up(args: Any):
     args.data = 'stake'
-    args.receiver = VALIDATORS_SMART_CONTRACT_ADDRESS
+    args.receiver = Address.new_from_hex(VALIDATORS_SMART_CONTRACT_ADDRESS_HEX, get_address_hrp()).to_bech32()
 
     if args.estimate_gas:
         args.gas_limit = estimate_system_sc_call(args.data, MetaChainSystemSCsCost.STAKE, 1)
@@ -83,7 +83,7 @@ def prepare_args_for_top_up(args: Any):
 def prepare_args_for_unstake(args: Any):
     parsed_keys, num_keys = utils.parse_keys(args.nodes_public_keys)
     args.data = 'unStake' + parsed_keys
-    args.receiver = VALIDATORS_SMART_CONTRACT_ADDRESS
+    args.receiver = Address.new_from_hex(VALIDATORS_SMART_CONTRACT_ADDRESS_HEX, get_address_hrp()).to_bech32()
 
     if args.estimate_gas:
         args.gas_limit = estimate_system_sc_call(args.data, MetaChainSystemSCsCost.UNSTAKE, num_keys)
@@ -92,7 +92,7 @@ def prepare_args_for_unstake(args: Any):
 def prepare_args_for_unbond(args: Any):
     parsed_keys, num_keys = utils.parse_keys(args.nodes_public_keys)
     args.data = 'unBond' + parsed_keys
-    args.receiver = VALIDATORS_SMART_CONTRACT_ADDRESS
+    args.receiver = Address.new_from_hex(VALIDATORS_SMART_CONTRACT_ADDRESS_HEX, get_address_hrp()).to_bech32()
 
     if args.estimate_gas:
         args.gas_limit = estimate_system_sc_call(args.data, MetaChainSystemSCsCost.UNBOND, num_keys)
@@ -101,7 +101,7 @@ def prepare_args_for_unbond(args: Any):
 def prepare_args_for_unjail(args: Any):
     parsed_keys, num_keys = utils.parse_keys(args.nodes_public_keys)
     args.data = 'unJail' + parsed_keys
-    args.receiver = VALIDATORS_SMART_CONTRACT_ADDRESS
+    args.receiver = Address.new_from_hex(VALIDATORS_SMART_CONTRACT_ADDRESS_HEX, get_address_hrp()).to_bech32()
 
     if args.estimate_gas:
         args.gas_limit = estimate_system_sc_call(args.data, MetaChainSystemSCsCost.UNJAIL, num_keys)
@@ -110,7 +110,7 @@ def prepare_args_for_unjail(args: Any):
 def prepare_args_for_change_reward_address(args: Any):
     reward_address = Address.new_from_bech32(args.reward_address)
     args.data = 'changeRewardAddress@' + reward_address.hex()
-    args.receiver = VALIDATORS_SMART_CONTRACT_ADDRESS
+    args.receiver = Address.new_from_hex(VALIDATORS_SMART_CONTRACT_ADDRESS_HEX, get_address_hrp()).to_bech32()
 
     if args.estimate_gas:
         args.gas_limit = estimate_system_sc_call(args.data, MetaChainSystemSCsCost.CHANGE_REWARD_ADDRESS)
@@ -118,7 +118,7 @@ def prepare_args_for_change_reward_address(args: Any):
 
 def prepare_args_for_claim(args: Any):
     args.data = 'claim'
-    args.receiver = VALIDATORS_SMART_CONTRACT_ADDRESS
+    args.receiver = Address.new_from_hex(VALIDATORS_SMART_CONTRACT_ADDRESS_HEX, get_address_hrp()).to_bech32()
 
     if args.estimate_gas:
         args.gas_limit = estimate_system_sc_call(args.data, MetaChainSystemSCsCost.CLAIM)
@@ -128,7 +128,7 @@ def prepare_args_for_unstake_nodes(args: Any):
     parsed_keys, num_keys = utils.parse_keys(args.nodes_public_keys)
     args.data = 'unStakeNodes' + parsed_keys
 
-    args.receiver = VALIDATORS_SMART_CONTRACT_ADDRESS
+    args.receiver = Address.new_from_hex(VALIDATORS_SMART_CONTRACT_ADDRESS_HEX, get_address_hrp()).to_bech32()
     if args.estimate_gas:
         args.gas_limit = estimate_system_sc_call(args.data, MetaChainSystemSCsCost.UNSTAKE, num_keys)
 
@@ -137,7 +137,7 @@ def prepare_args_for_unstake_tokens(args: Any):
     args.data = 'unStakeTokens'
     args.data += '@' + utils.str_int_to_hex_str(str(args.unstake_value))
 
-    args.receiver = VALIDATORS_SMART_CONTRACT_ADDRESS
+    args.receiver = Address.new_from_hex(VALIDATORS_SMART_CONTRACT_ADDRESS_HEX, get_address_hrp()).to_bech32()
     if args.estimate_gas:
         args.gas_limit = estimate_system_sc_call(args.data, MetaChainSystemSCsCost.UNSTAKE_TOKENS)
 
@@ -146,7 +146,7 @@ def prepare_args_for_unbond_nodes(args: Any):
     parsed_keys, num_keys = utils.parse_keys(args.nodes_public_keys)
     args.data = 'unBondNodes' + parsed_keys
 
-    args.receiver = VALIDATORS_SMART_CONTRACT_ADDRESS
+    args.receiver = Address.new_from_hex(VALIDATORS_SMART_CONTRACT_ADDRESS_HEX, get_address_hrp()).to_bech32()
     if args.estimate_gas:
         args.gas_limit = estimate_system_sc_call(args.data, MetaChainSystemSCsCost.UNBOND, num_keys)
 
@@ -155,7 +155,7 @@ def prepare_args_for_unbond_tokens(args: Any):
     args.data = 'unBondTokens'
     args.data += '@' + utils.str_int_to_hex_str(str(args.unbond_value))
 
-    args.receiver = VALIDATORS_SMART_CONTRACT_ADDRESS
+    args.receiver = Address.new_from_hex(VALIDATORS_SMART_CONTRACT_ADDRESS_HEX, get_address_hrp()).to_bech32()
     if args.estimate_gas:
         args.gas_limit = estimate_system_sc_call(args.data, MetaChainSystemSCsCost.UNBOND_TOKENS)
 
@@ -163,7 +163,7 @@ def prepare_args_for_unbond_tokens(args: Any):
 def prepare_args_for_clean_registered_data(args: Any):
     args.data = 'cleanRegisteredData'
 
-    args.receiver = VALIDATORS_SMART_CONTRACT_ADDRESS
+    args.receiver = Address.new_from_hex(VALIDATORS_SMART_CONTRACT_ADDRESS_HEX, get_address_hrp()).to_bech32()
     if args.estimate_gas:
         args.gas_limit = estimate_system_sc_call(args.data, MetaChainSystemSCsCost.STAKE)
 
@@ -172,7 +172,7 @@ def prepare_args_for_restake_unstaked_nodes(args: Any):
     parsed_keys, num_keys = utils.parse_keys(args.nodes_public_keys)
     args.data = 'reStakeUnStakedNodes' + parsed_keys
 
-    args.receiver = VALIDATORS_SMART_CONTRACT_ADDRESS
+    args.receiver = Address.new_from_hex(VALIDATORS_SMART_CONTRACT_ADDRESS_HEX, get_address_hrp()).to_bech32()
     if args.estimate_gas:
         args.gas_limit = estimate_system_sc_call(args.data, MetaChainSystemSCsCost.STAKE, num_keys)
 

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

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