Skip to content

transactions refactoring #550

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
popenta merged 2 commits into from
Sep 25, 2025
Merged

transactions refactoring #550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23a0c6d
transactions refactoring
popenta Sep 24, 2025
7bd6d1e
Merge branch 'feat/next' into tx-refactoring
popenta Sep 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 59 additions & 29 deletions multiversx_sdk_cli/cli_transactions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@
from pathlib import Path
from typing import Any

from multiversx_sdk import Address, ProxyNetworkProvider, TransactionComputer
from multiversx_sdk import (
Address,
ProxyNetworkProvider,
TransactionComputer,
TransfersController,
)

from multiversx_sdk_cli import cli_shared, utils
from multiversx_sdk_cli.args_validation import (
Expand All @@ -13,14 +18,12 @@
validate_proxy_argument,
validate_receiver_args,
)
from multiversx_sdk_cli.base_transactions_controller import BaseTransactionsController
from multiversx_sdk_cli.cli_output import CLIOutputBuilder
from multiversx_sdk_cli.config import get_config_for_network_providers
from multiversx_sdk_cli.errors import BadUsage, IncorrectWalletError, NoWalletProvided
from multiversx_sdk_cli.transactions import (
TransactionsController,
load_transaction_from_file,
)
from multiversx_sdk_cli.guardian_relayer_data import GuardianRelayerData
from multiversx_sdk_cli.signing_wrapper import SigningWrapper
from multiversx_sdk_cli.transactions import load_transaction_from_file

logger = logging.getLogger("cli.transactions")

Expand Down Expand Up @@ -101,38 +104,59 @@ def create_transaction(args: Any):
validate_broadcast_args(args)
validate_chain_id_args(args)

if args.data_file:
args.data = Path(args.data_file).read_text()

transfers = getattr(args, "token_transfers", None)

if transfers and args.data:
raise BadUsage("You cannot provide both data and token transfers")

sender = cli_shared.prepare_sender(args)
guardian_and_relayer_data = cli_shared.get_guardian_and_relayer_data(
sender=sender.address.to_bech32(),
args=args,
)

if args.data_file:
args.data = Path(args.data_file).read_text()

native_amount = int(args.value)

transfers = getattr(args, "token_transfers", None)
receiver = Address.new_from_bech32(args.receiver)
transfers = cli_shared.prepare_token_transfers(transfers) if transfers else None

chain_id = cli_shared.get_chain_id(args.proxy, args.chain)
gas_estimator = cli_shared.initialize_gas_limit_estimator(args)
tx_controller = TransactionsController(chain_id, gas_estimator)

tx = tx_controller.create_transaction(
controller = TransfersController(chain_id=chain_id, gas_limit_estimator=gas_estimator)

if not transfers:
tx = controller.create_transaction_for_native_token_transfer(
sender=sender,
nonce=sender.nonce,
receiver=receiver,
native_transfer_amount=native_amount,
data=args.data.encode() if args.data 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,
)
else:
tx = controller.create_transaction_for_transfer(
sender=sender,
nonce=sender.nonce,
receiver=receiver,
native_transfer_amount=native_amount,
token_transfers=transfers,
guardian=guardian_and_relayer_data.guardian_address,
relayer=guardian_and_relayer_data.relayer_address,
gas_limit=args.gas_limit,
gas_price=args.gas_price,
)

cli_shared.alter_transaction_and_sign_again_if_needed(
args=args,
tx=tx,
sender=sender,
receiver=Address.new_from_bech32(args.receiver),
native_amount=native_amount,
gas_limit=args.gas_limit,
gas_price=args.gas_price,
nonce=sender.nonce,
version=args.version,
options=args.options,
token_transfers=transfers,
data=args.data,
guardian_and_relayer_data=guardian_and_relayer_data,
)

cli_shared.send_or_simulate(tx, args)


Expand Down Expand Up @@ -180,18 +204,24 @@ def sign_transaction(args: Any):

tx_computer = TransactionComputer()
if tx.guardian and not tx_computer.has_options_set_for_guarded_transaction(tx):
raise BadUsage("Guardian wallet provided but the transaction has incorrect options.")
raise BadUsage("Guardian wallet provided but the transaction has incorrect options")
Copy link

Copilot AI Sep 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing period at the end of the error message to maintain consistency with error message formatting.

Suggested change
raise BadUsage("Guardian wallet provided but the transaction has incorrect options")
raise BadUsage("Guardian wallet provided but the transaction has incorrect options.")

Copilot uses AI. Check for mistakes.

tx_controller = BaseTransactionsController()
tx_controller.sign_transaction(
transaction=tx,
sender=sender,
guardian_and_relayer = GuardianRelayerData(
guardian=guardian,
guardian_address=tx.guardian,
relayer=relayer,
relayer_address=tx.relayer,
guardian_service_url=args.guardian_service_url,
guardian_2fa_code=args.guardian_2fa_code,
)

signer = SigningWrapper()
signer.sign_transaction(
transaction=tx,
sender=sender,
guardian_and_relayer=guardian_and_relayer,
)

cli_shared.send_or_simulate(tx, args)


Expand Down
21 changes: 13 additions & 8 deletions multiversx_sdk_cli/dns.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
AddressComputer,
SmartContractQuery,
SmartContractQueryResponse,
TransfersController,
)

from multiversx_sdk_cli import cli_shared
Expand All @@ -16,7 +17,6 @@
)
from multiversx_sdk_cli.config_env import get_address_hrp
from multiversx_sdk_cli.constants import ADDRESS_ZERO_HEX
from multiversx_sdk_cli.transactions import TransactionsController

MaxNumShards = 256
ShardIdentiferLen = 2
Expand Down Expand Up @@ -77,21 +77,26 @@ def register(args: Any):

chain_id = cli_shared.get_chain_id(args.proxy, args.chain)
gas_estimator = cli_shared.initialize_gas_limit_estimator(args)
controller = TransactionsController(chain_id=chain_id, gas_limit_estimator=gas_estimator)
controller = TransfersController(chain_id=chain_id, gas_limit_estimator=gas_estimator)

tx = controller.create_transaction(
tx = controller.create_transaction_for_native_token_transfer(
sender=sender,
receiver=receiver,
native_amount=native_amount,
native_transfer_amount=native_amount,
gas_limit=args.gas_limit,
gas_price=args.gas_price,
nonce=sender.nonce,
version=args.version,
options=args.options,
data=data,
guardian_and_relayer_data=guardian_and_relayer_data,
data=data.encode(),
guardian=guardian_and_relayer_data.guardian_address,
relayer=guardian_and_relayer_data.relayer_address,
)

cli_shared.alter_transaction_and_sign_again_if_needed(
args=args,
tx=tx,
sender=sender,
guardian_and_relayer_data=guardian_and_relayer_data,
)
cli_shared.send_or_simulate(tx, args)


Expand Down
22 changes: 22 additions & 0 deletions multiversx_sdk_cli/tests/test_cli_transactions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,6 +463,28 @@ def test_estimate_gas_with_multiplier(capsys: Any):
assert tx_json["gasLimit"] == 75000


def test_raise_error_when_data_and_transfers_provided(capsys: Any):
Copy link
Contributor

@andreibancioiu andreibancioiu Sep 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

return_code = main(
[
"tx",
"new",
"--pem",
str(testdata_path / "alice.pem"),
"--receiver",
"erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx",
"--nonce",
"7",
"--chain",
"D",
"--data",
"hello",
"--token-transfers",
"TEST-123456",
]
)
assert return_code == 1


def _read_stdout(capsys: Any) -> str:
stdout: str = capsys.readouterr().out.strip()
return stdout
Loading
Loading