Merge branch 'multisig-refactoring' into remove-validators-wrapper

Author: popenta

.github/workflows/test-localnet-tests.yml

@@ -52,7 +52,7 @@ jobs:
           nohup python3 -m multiversx_sdk_cli.cli localnet start --configfile=./multiversx_sdk_cli/tests/testdata/localnet_with_resolution_remote.toml > localnet.log 2>&1 & echo $! > localnet.pid
           sleep 120
 
-      # - name: Test localnet dependent tests
-      #   run: |
-      #      pytest -m require_localnet .
-      #      python3 -m multiversx_sdk_cli.cli localnet clean --configfile=./multiversx_sdk_cli/tests/testdata/localnet_with_resolution_remote.toml
+      - name: Test localnet dependent tests
+        run: |
+           pytest -m require_localnet .
+           python3 -m multiversx_sdk_cli.cli localnet clean --configfile=./multiversx_sdk_cli/tests/testdata/localnet_with_resolution_remote.toml

.github/workflows/test-localnet.yml

@@ -23,6 +23,7 @@
 import multiversx_sdk_cli.cli_ledger
 import multiversx_sdk_cli.cli_localnet
 import multiversx_sdk_cli.cli_multisig
+import multiversx_sdk_cli.cli_tokens
 import multiversx_sdk_cli.cli_transactions
 import multiversx_sdk_cli.cli_validator_wallet
 import multiversx_sdk_cli.cli_validators
@@ -142,6 +143,7 @@ def setup_parser(args: list[str]):
     commands.append(multiversx_sdk_cli.cli_governance.setup_parser(args, subparsers))
     commands.append(multiversx_sdk_cli.cli_config_env.setup_parser(subparsers))
     commands.append(multiversx_sdk_cli.cli_get.setup_parser(subparsers))
+    commands.append(multiversx_sdk_cli.cli_tokens.setup_parser(args, subparsers))
 
     parser.epilog = """
 ----------------------

multiversx_sdk_cli/cli.py

@@ -30,9 +30,7 @@
 from multiversx_sdk_cli.constants import NUMBER_OF_SHARDS
 from multiversx_sdk_cli.contract_verification import trigger_contract_verification
 from multiversx_sdk_cli.docker import is_docker_installed, run_docker
-from multiversx_sdk_cli.errors import DockerMissingError, QueryContractError
-from multiversx_sdk_cli.guardian_relayer_data import GuardianRelayerData
-from multiversx_sdk_cli.signing_wrapper import SigningWrapper
+from multiversx_sdk_cli.errors import BadUsage, DockerMissingError, QueryContractError
 from multiversx_sdk_cli.ux import show_warning
 
 logger = logging.getLogger("cli.contracts")
@@ -334,13 +332,9 @@ def _initialize_controller(args: Any) -> SmartContractController:
     )
 
 
-def _sign_transaction(transaction: Transaction, sender: Any, guardian_and_relayer_data: GuardianRelayerData):
-    signer = SigningWrapper()
-    signer.sign_transaction(
-        transaction=transaction,
-        sender=sender,
-        guardian_and_relayer=guardian_and_relayer_data,
-    )
+def _ensure_args_for_gas_estimation(args: Any):
+    if not args.proxy and not args.gas_limit:
+        raise BadUsage("To estimate the gas limit, you need to provide `--proxy` or set a value using `--gas-limit`")
 
 
 def deploy(args: Any):
@@ -350,6 +344,8 @@ def deploy(args: Any):
     validate_broadcast_args(args)
     validate_chain_id_args(args)
 
+    _ensure_args_for_gas_estimation(args)
+
     sender = cli_shared.prepare_sender(args)
     guardian_and_relayer_data = cli_shared.get_guardian_and_relayer_data(
         sender=sender.address.to_bech32(),
@@ -371,8 +367,8 @@ def deploy(args: Any):
         is_readable=args.metadata_readable,
         is_payable=args.metadata_payable,
         is_payable_by_sc=args.metadata_payable_by_sc,
-        guardian=guardian_and_relayer_data.guardian.address if guardian_and_relayer_data.guardian else None,
-        relayer=guardian_and_relayer_data.relayer.address if guardian_and_relayer_data.relayer else None,
+        guardian=guardian_and_relayer_data.guardian_address,
+        relayer=guardian_and_relayer_data.relayer_address,
         gas_limit=args.gas_limit,
         gas_price=args.gas_price,
     )
@@ -384,12 +380,17 @@ def deploy(args: Any):
 
     cli_config = MxpyEnv.from_active_env()
     utils.log_explorer_contract_address(
-        chain=controller.factory.config.chain_id,
+        chain=cli_shared.get_chain_id(args.proxy, args.chain),
         address=contract_address.to_bech32(),
         explorer_url=cli_config.explorer_url,
     )
 
-    _sign_transaction(tx, sender, guardian_and_relayer_data)
+    cli_shared.alter_transaction_and_sign_again_if_needed(
+        args=args,
+        tx=tx,
+        sender=sender,
+        guardian_and_relayer_data=guardian_and_relayer_data,
+    )
     _send_or_simulate(tx, contract_address, args)
 
 
@@ -400,6 +401,8 @@ def call(args: Any):
     validate_broadcast_args(args)
     validate_chain_id_args(args)
 
+    _ensure_args_for_gas_estimation(args)
+
     sender = cli_shared.prepare_sender(args)
     guardian_and_relayer_data = cli_shared.get_guardian_and_relayer_data(
         sender=sender.address.to_bech32(),
@@ -425,13 +428,18 @@ def call(args: Any):
         arguments=arguments,
         native_transfer_amount=int(args.value),
         token_transfers=token_transfers,
-        guardian=guardian_and_relayer_data.guardian.address if guardian_and_relayer_data.guardian else None,
-        relayer=guardian_and_relayer_data.relayer.address if guardian_and_relayer_data.relayer else None,
+        guardian=guardian_and_relayer_data.guardian_address,
+        relayer=guardian_and_relayer_data.relayer_address,
         gas_limit=args.gas_limit,
         gas_price=args.gas_price,
     )
 
-    _sign_transaction(tx, sender, guardian_and_relayer_data)
+    cli_shared.alter_transaction_and_sign_again_if_needed(
+        args=args,
+        tx=tx,
+        sender=sender,
+        guardian_and_relayer_data=guardian_and_relayer_data,
+    )
     _send_or_simulate(tx, contract_address, args)
 
 
@@ -442,6 +450,8 @@ def upgrade(args: Any):
     validate_broadcast_args(args)
     validate_chain_id_args(args)
 
+    _ensure_args_for_gas_estimation(args)
+
     sender = cli_shared.prepare_sender(args)
     guardian_and_relayer_data = cli_shared.get_guardian_and_relayer_data(
         sender=sender.address.to_bech32(),
@@ -466,13 +476,18 @@ def upgrade(args: Any):
         is_readable=args.metadata_readable,
         is_payable=args.metadata_payable,
         is_payable_by_sc=args.metadata_payable_by_sc,
-        guardian=guardian_and_relayer_data.guardian.address if guardian_and_relayer_data.guardian else None,
-        relayer=guardian_and_relayer_data.relayer.address if guardian_and_relayer_data.relayer else None,
+        guardian=guardian_and_relayer_data.guardian_address,
+        relayer=guardian_and_relayer_data.relayer_address,
         gas_limit=args.gas_limit,
         gas_price=args.gas_price,
     )
 
-    _sign_transaction(tx, sender, guardian_and_relayer_data)
+    cli_shared.alter_transaction_and_sign_again_if_needed(
+        args=args,
+        tx=tx,
+        sender=sender,
+        guardian_and_relayer_data=guardian_and_relayer_data,
+    )
     _send_or_simulate(tx, contract_address, args)