Skip to content

Commit 32787af

Browse files
popentapopenta
committed
refactoring
1 parent 693d730 commit 32787af

10 files changed

Lines changed: 60 additions & 104 deletions

‎multiversx_sdk_cli/cli_contracts.py‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -319,8 +319,7 @@ def build(args: Any):
319319
def deploy(args: Any):
320320
logger.debug("deploy")
321321

322-
cli_config = MxpyEnv.from_active_env()
323-
cli_shared.set_proxy_from_config_if_not_provided(args, cli_config)
322+
cli_shared.set_proxy_from_config_if_not_provided(args)
324323

325324
validate_transaction_args(args)
326325
ensure_wallet_args_are_provided(args)
@@ -363,6 +362,8 @@ def deploy(args: Any):
363362
contract_address = address_computer.compute_contract_address(deployer=sender.address, deployment_nonce=tx.nonce)
364363

365364
logger.info("Contract address: %s", contract_address.to_bech32())
365+
366+
cli_config = MxpyEnv.from_active_env()
366367
utils.log_explorer_contract_address(args.chain, contract_address.to_bech32(), cli_config.explorer_url)
367368

368369
_send_or_simulate(tx, contract_address, args)
@@ -371,8 +372,7 @@ def deploy(args: Any):
371372
def call(args: Any):
372373
logger.debug("call")
373374

374-
cli_config = MxpyEnv.from_active_env()
375-
cli_shared.set_proxy_from_config_if_not_provided(args, cli_config)
375+
cli_shared.set_proxy_from_config_if_not_provided(args)
376376

377377
validate_transaction_args(args)
378378
ensure_wallet_args_are_provided(args)
@@ -420,8 +420,7 @@ def call(args: Any):
420420
def upgrade(args: Any):
421421
logger.debug("upgrade")
422422

423-
cli_config = MxpyEnv.from_active_env()
424-
cli_shared.set_proxy_from_config_if_not_provided(args, cli_config)
423+
cli_shared.set_proxy_from_config_if_not_provided(args)
425424

426425
validate_transaction_args(args)
427426
ensure_wallet_args_are_provided(args)
@@ -468,8 +467,7 @@ def upgrade(args: Any):
468467
def query(args: Any):
469468
logger.debug("query")
470469

471-
cli_config = MxpyEnv.from_active_env()
472-
cli_shared.set_proxy_from_config_if_not_provided(args, cli_config)
470+
cli_shared.set_proxy_from_config_if_not_provided(args)
473471

474472
validate_proxy_argument(args)
475473

‎multiversx_sdk_cli/cli_delegation.py‎

Lines changed: 19 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
)
2222
from multiversx_sdk_cli.config import get_config_for_network_providers
2323
from multiversx_sdk_cli.delegation import DelegationOperations
24-
from multiversx_sdk_cli.env import MxpyEnv
2524

2625

2726
def setup_parser(args: list[str], subparsers: Any) -> Any:
@@ -403,8 +402,7 @@ def _get_delegation_controller(args: Any):
403402

404403

405404
def do_create_delegation_contract(args: Any):
406-
cli_config = MxpyEnv.from_active_env()
407-
cli_shared.set_proxy_from_config_if_not_provided(args, cli_config)
405+
cli_shared.set_proxy_from_config_if_not_provided(args)
408406

409407
validate_arguments(args)
410408

@@ -434,8 +432,7 @@ def do_create_delegation_contract(args: Any):
434432

435433

436434
def get_contract_address_by_deploy_tx_hash(args: Any):
437-
cli_config = MxpyEnv.from_active_env()
438-
cli_shared.set_proxy_from_config_if_not_provided(args, cli_config)
435+
cli_shared.set_proxy_from_config_if_not_provided(args)
439436

440437
validate_proxy_argument(args)
441438

@@ -454,8 +451,7 @@ def get_contract_address_by_deploy_tx_hash(args: Any):
454451

455452

456453
def add_new_nodes(args: Any):
457-
cli_config = MxpyEnv.from_active_env()
458-
cli_shared.set_proxy_from_config_if_not_provided(args, cli_config)
454+
cli_shared.set_proxy_from_config_if_not_provided(args)
459455

460456
validate_arguments(args)
461457

@@ -505,8 +501,7 @@ def _get_public_keys_and_signed_messages(args: Any) -> tuple[list[ValidatorPubli
505501

506502

507503
def remove_nodes(args: Any):
508-
cli_config = MxpyEnv.from_active_env()
509-
cli_shared.set_proxy_from_config_if_not_provided(args, cli_config)
504+
cli_shared.set_proxy_from_config_if_not_provided(args)
510505

511506
validate_arguments(args)
512507
_check_if_either_bls_keys_or_validators_file_are_provided(args)
@@ -557,8 +552,7 @@ def _parse_public_bls_keys(public_bls_keys: str) -> list[ValidatorPublicKey]:
557552

558553

559554
def stake_nodes(args: Any):
560-
cli_config = MxpyEnv.from_active_env()
561-
cli_shared.set_proxy_from_config_if_not_provided(args, cli_config)
555+
cli_shared.set_proxy_from_config_if_not_provided(args)
562556

563557
_check_if_either_bls_keys_or_validators_file_are_provided(args)
564558
validate_arguments(args)
@@ -598,8 +592,7 @@ def _check_if_either_bls_keys_or_validators_file_are_provided(args: Any):
598592

599593

600594
def unbond_nodes(args: Any):
601-
cli_config = MxpyEnv.from_active_env()
602-
cli_shared.set_proxy_from_config_if_not_provided(args, cli_config)
595+
cli_shared.set_proxy_from_config_if_not_provided(args)
603596

604597
_check_if_either_bls_keys_or_validators_file_are_provided(args)
605598
validate_arguments(args)
@@ -631,8 +624,7 @@ def unbond_nodes(args: Any):
631624

632625

633626
def unstake_nodes(args: Any):
634-
cli_config = MxpyEnv.from_active_env()
635-
cli_shared.set_proxy_from_config_if_not_provided(args, cli_config)
627+
cli_shared.set_proxy_from_config_if_not_provided(args)
636628

637629
_check_if_either_bls_keys_or_validators_file_are_provided(args)
638630
validate_arguments(args)
@@ -664,8 +656,7 @@ def unstake_nodes(args: Any):
664656

665657

666658
def unjail_nodes(args: Any):
667-
cli_config = MxpyEnv.from_active_env()
668-
cli_shared.set_proxy_from_config_if_not_provided(args, cli_config)
659+
cli_shared.set_proxy_from_config_if_not_provided(args)
669660

670661
_check_if_either_bls_keys_or_validators_file_are_provided(args)
671662
validate_arguments(args)
@@ -697,8 +688,7 @@ def unjail_nodes(args: Any):
697688

698689

699690
def delegate(args: Any):
700-
cli_config = MxpyEnv.from_active_env()
701-
cli_shared.set_proxy_from_config_if_not_provided(args, cli_config)
691+
cli_shared.set_proxy_from_config_if_not_provided(args)
702692

703693
validate_arguments(args)
704694

@@ -728,8 +718,7 @@ def delegate(args: Any):
728718

729719

730720
def claim_rewards(args: Any):
731-
cli_config = MxpyEnv.from_active_env()
732-
cli_shared.set_proxy_from_config_if_not_provided(args, cli_config)
721+
cli_shared.set_proxy_from_config_if_not_provided(args)
733722

734723
validate_arguments(args)
735724

@@ -757,8 +746,7 @@ def claim_rewards(args: Any):
757746

758747

759748
def redelegate_rewards(args: Any):
760-
cli_config = MxpyEnv.from_active_env()
761-
cli_shared.set_proxy_from_config_if_not_provided(args, cli_config)
749+
cli_shared.set_proxy_from_config_if_not_provided(args)
762750

763751
validate_arguments(args)
764752

@@ -786,8 +774,7 @@ def redelegate_rewards(args: Any):
786774

787775

788776
def undelegate(args: Any):
789-
cli_config = MxpyEnv.from_active_env()
790-
cli_shared.set_proxy_from_config_if_not_provided(args, cli_config)
777+
cli_shared.set_proxy_from_config_if_not_provided(args)
791778

792779
validate_arguments(args)
793780

@@ -817,8 +804,7 @@ def undelegate(args: Any):
817804

818805

819806
def withdraw(args: Any):
820-
cli_config = MxpyEnv.from_active_env()
821-
cli_shared.set_proxy_from_config_if_not_provided(args, cli_config)
807+
cli_shared.set_proxy_from_config_if_not_provided(args)
822808

823809
validate_arguments(args)
824810

@@ -847,8 +833,7 @@ def withdraw(args: Any):
847833

848834

849835
def change_service_fee(args: Any):
850-
cli_config = MxpyEnv.from_active_env()
851-
cli_shared.set_proxy_from_config_if_not_provided(args, cli_config)
836+
cli_shared.set_proxy_from_config_if_not_provided(args)
852837

853838
validate_arguments(args)
854839

@@ -878,8 +863,7 @@ def change_service_fee(args: Any):
878863

879864

880865
def modify_delegation_cap(args: Any):
881-
cli_config = MxpyEnv.from_active_env()
882-
cli_shared.set_proxy_from_config_if_not_provided(args, cli_config)
866+
cli_shared.set_proxy_from_config_if_not_provided(args)
883867

884868
validate_arguments(args)
885869

@@ -909,8 +893,7 @@ def modify_delegation_cap(args: Any):
909893

910894

911895
def automatic_activation(args: Any):
912-
cli_config = MxpyEnv.from_active_env()
913-
cli_shared.set_proxy_from_config_if_not_provided(args, cli_config)
896+
cli_shared.set_proxy_from_config_if_not_provided(args)
914897

915898
validate_arguments(args)
916899

@@ -941,8 +924,7 @@ def automatic_activation(args: Any):
941924

942925

943926
def redelegate_cap(args: Any):
944-
cli_config = MxpyEnv.from_active_env()
945-
cli_shared.set_proxy_from_config_if_not_provided(args, cli_config)
927+
cli_shared.set_proxy_from_config_if_not_provided(args)
946928

947929
validate_arguments(args)
948930

@@ -973,8 +955,7 @@ def redelegate_cap(args: Any):
973955

974956

975957
def set_metadata(args: Any):
976-
cli_config = MxpyEnv.from_active_env()
977-
cli_shared.set_proxy_from_config_if_not_provided(args, cli_config)
958+
cli_shared.set_proxy_from_config_if_not_provided(args)
978959

979960
validate_arguments(args)
980961

@@ -1006,8 +987,7 @@ def set_metadata(args: Any):
1006987

1007988

1008989
def make_new_contract_from_validator_data(args: Any):
1009-
cli_config = MxpyEnv.from_active_env()
1010-
cli_shared.set_proxy_from_config_if_not_provided(args, cli_config)
990+
cli_shared.set_proxy_from_config_if_not_provided(args)
1011991

1012992
validate_arguments(args)
1013993

‎multiversx_sdk_cli/cli_dns.py‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
validate_name,
1818
version,
1919
)
20-
from multiversx_sdk_cli.env import MxpyEnv
2120
from multiversx_sdk_cli.errors import ArgumentsNotProvidedError
2221

2322

@@ -137,8 +136,7 @@ def _ensure_proxy_is_provided(args: Any):
137136

138137

139138
def dns_resolve(args: Any):
140-
cli_config = MxpyEnv.from_active_env()
141-
cli_shared.set_proxy_from_config_if_not_provided(args, cli_config)
139+
cli_shared.set_proxy_from_config_if_not_provided(args)
142140

143141
_ensure_proxy_is_provided(args)
144142

@@ -149,8 +147,7 @@ def dns_resolve(args: Any):
149147

150148

151149
def dns_validate_name(args: Any):
152-
cli_config = MxpyEnv.from_active_env()
153-
cli_shared.set_proxy_from_config_if_not_provided(args, cli_config)
150+
cli_shared.set_proxy_from_config_if_not_provided(args)
154151

155152
_ensure_proxy_is_provided(args)
156153

@@ -175,8 +172,7 @@ def get_dns_address_for_name_hex(args: Any):
175172

176173

177174
def get_registration_cost(args: Any):
178-
cli_config = MxpyEnv.from_active_env()
179-
cli_shared.set_proxy_from_config_if_not_provided(args, cli_config)
175+
cli_shared.set_proxy_from_config_if_not_provided(args)
180176

181177
_ensure_proxy_is_provided(args)
182178

@@ -185,8 +181,7 @@ def get_registration_cost(args: Any):
185181

186182

187183
def get_version(args: Any):
188-
cli_config = MxpyEnv.from_active_env()
189-
cli_shared.set_proxy_from_config_if_not_provided(args, cli_config)
184+
cli_shared.set_proxy_from_config_if_not_provided(args)
190185

191186
_ensure_proxy_is_provided(args)
192187

‎multiversx_sdk_cli/cli_governance.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
)
2020
from multiversx_sdk_cli.cli_output import CLIOutputBuilder
2121
from multiversx_sdk_cli.config import get_config_for_network_providers
22-
from multiversx_sdk_cli.env import MxpyEnv
2322
from multiversx_sdk_cli.governance import GovernanceWrapper
2423

2524

@@ -200,8 +199,7 @@ def _ensure_args(args: Any):
200199

201200

202201
def _ensure_proxy_arg(args: Any):
203-
cli_config = MxpyEnv.from_active_env()
204-
cli_shared.set_proxy_from_config_if_not_provided(args, cli_config)
202+
cli_shared.set_proxy_from_config_if_not_provided(args)
205203
validate_proxy_argument(args)
206204

207205

‎multiversx_sdk_cli/cli_multisig.py‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
from multiversx_sdk_cli.cli_output import CLIOutputBuilder
3939
from multiversx_sdk_cli.config import get_config_for_network_providers
4040
from multiversx_sdk_cli.constants import NUMBER_OF_SHARDS
41-
from multiversx_sdk_cli.env import MxpyEnv
4241
from multiversx_sdk_cli.multisig import MultisigWrapper
4342

4443
logger = logging.getLogger("cli.multisig")
@@ -656,8 +655,7 @@ def _add_common_args(args: Any, sub: Any, with_contract_arg: bool = True, with_r
656655

657656

658657
def _ensure_args(args: Any):
659-
cli_config = MxpyEnv.from_active_env()
660-
cli_shared.set_proxy_from_config_if_not_provided(args, cli_config)
658+
cli_shared.set_proxy_from_config_if_not_provided(args)
661659

662660
validate_transaction_args(args)
663661
ensure_wallet_args_are_provided(args)
@@ -666,8 +664,7 @@ def _ensure_args(args: Any):
666664

667665

668666
def _ensure_proxy_arg(args: Any):
669-
cli_config = MxpyEnv.from_active_env()
670-
cli_shared.set_proxy_from_config_if_not_provided(args, cli_config)
667+
cli_shared.set_proxy_from_config_if_not_provided(args)
671668
validate_proxy_argument(args)
672669

673670

‎multiversx_sdk_cli/cli_shared.py‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -603,16 +603,15 @@ def send_or_simulate(tx: Transaction, args: Any, dump_output: bool = True) -> CL
603603
output_builder.set_emitted_transaction(tx)
604604
outfile = args.outfile if hasattr(args, "outfile") else None
605605

606-
cli_config = MxpyEnv.from_active_env()
607606
hash = b""
608607
try:
609608
if send_wait_result:
610-
_confirm_continuation_if_required(cli_config, tx)
609+
_confirm_continuation_if_required(tx)
611610

612611
transaction_on_network = send_and_wait_for_result(tx, proxy, args.timeout)
613612
output_builder.set_awaited_transaction(transaction_on_network)
614613
elif send_only:
615-
_confirm_continuation_if_required(cli_config, tx)
614+
_confirm_continuation_if_required(tx)
616615

617616
hash = proxy.send_transaction(tx)
618617
output_builder.set_emitted_transaction_hash(hash.hex())
@@ -626,6 +625,7 @@ def send_or_simulate(tx: Transaction, args: Any, dump_output: bool = True) -> CL
626625
utils.dump_out_json(output_transaction, outfile=outfile)
627626

628627
if send_only and hash:
628+
cli_config = MxpyEnv.from_active_env()
629629
log_explorer_transaction(
630630
chain=output_transaction["emittedTransaction"]["chainID"],
631631
transaction_hash=output_transaction["emittedTransactionHash"],
@@ -635,7 +635,9 @@ def send_or_simulate(tx: Transaction, args: Any, dump_output: bool = True) -> CL
635635
return output_builder
636636

637637

638-
def _confirm_continuation_if_required(env: MxpyEnv, tx: Transaction) -> None:
638+
def _confirm_continuation_if_required(tx: Transaction) -> None:
639+
env = MxpyEnv.from_active_env()
640+
639641
if env.ask_confirmation:
640642
transaction = tx.to_dictionary()
641643

@@ -702,12 +704,13 @@ def prepare_token_transfers(transfers: list[str]) -> list[TokenTransfer]:
702704
return token_transfers
703705

704706

705-
def set_proxy_from_config_if_not_provided(args: Any, env: MxpyEnv) -> None:
707+
def set_proxy_from_config_if_not_provided(args: Any) -> None:
706708
"""This function modifies the `args` object by setting the proxy from the config if not already set. If proxy is not needed (chainID and nonce are provided), the proxy will not be set."""
707709
if not args.proxy:
708710
if hasattr(args, "chain") and args.chain and hasattr(args, "nonce") and args.nonce is not None:
709711
return
710712

713+
env = MxpyEnv.from_active_env()
711714
if env.proxy_url:
712715
logger.info(f"Using proxy URL from config: {env.proxy_url}")
713716
args.proxy = env.proxy_url

0 commit comments

Comments
 (0)