From 84c17bbfa0d1ef4e5cf97599848598804cd90d0b Mon Sep 17 00:00:00 2001 From: Alexandru Popenta Date: Tue, 23 Sep 2025 14:01:41 +0300 Subject: [PATCH 1/3] use guardian and relayer address instead of accounts --- multiversx_sdk_cli/cli_tokens.py | 172 +++++++++++++++---------------- 1 file changed, 86 insertions(+), 86 deletions(-) diff --git a/multiversx_sdk_cli/cli_tokens.py b/multiversx_sdk_cli/cli_tokens.py index e8a2dfd0..ca8dbc34 100644 --- a/multiversx_sdk_cli/cli_tokens.py +++ b/multiversx_sdk_cli/cli_tokens.py @@ -872,8 +872,8 @@ def issue_fungible(args: Any): can_change_owner=args.can_change_owner, can_upgrade=args.can_upgrade, can_add_special_roles=args.can_add_special_roles, - 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, ) @@ -904,8 +904,8 @@ def issue_semi_fungible(args: Any): can_change_owner=args.can_change_owner, can_upgrade=args.can_upgrade, can_add_special_roles=args.can_add_special_roles, - 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, ) @@ -936,8 +936,8 @@ def issue_non_fungible(args: Any): can_change_owner=args.can_change_owner, can_upgrade=args.can_upgrade, can_add_special_roles=args.can_add_special_roles, - 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, ) @@ -969,8 +969,8 @@ def register_meta_esdt(args: Any): can_change_owner=args.can_change_owner, can_upgrade=args.can_upgrade, can_add_special_roles=args.can_add_special_roles, - 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, ) @@ -998,8 +998,8 @@ def register_and_set_all_roles(args: Any): token_ticker=args.token_ticker, num_decimals=args.num_decimals, token_type=token_type, - 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, ) @@ -1022,8 +1022,8 @@ def set_burn_role_globally(args: Any): sender=sender, nonce=sender.nonce, token_identifier=args.token_identifier, - 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, ) @@ -1046,8 +1046,8 @@ def unset_burn_role_globally(args: Any): sender=sender, nonce=sender.nonce, token_identifier=args.token_identifier, - 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, ) @@ -1074,8 +1074,8 @@ def set_special_role_on_fungible(args: Any): add_role_local_mint=args.local_mint, add_role_local_burn=args.local_burn, add_role_esdt_transfer_role=args.esdt_transfer_role, - 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, ) @@ -1102,8 +1102,8 @@ def unset_special_role_on_fungible(args: Any): remove_role_local_mint=args.local_mint, remove_role_local_burn=args.local_burn, remove_role_esdt_transfer_role=args.esdt_transfer_role, - 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, ) @@ -1136,8 +1136,8 @@ def set_special_role_on_semi_fungible(args: Any): add_role_esdt_set_new_uri=args.esdt_set_new_uri, add_role_esdt_modify_creator=args.esdt_modify_creator, add_role_nft_recreate=args.nft_recreate, - 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, ) @@ -1169,8 +1169,8 @@ def unset_special_role_on_semi_fungible(args: Any): remove_role_esdt_set_new_uri=args.esdt_set_new_uri, remove_role_esdt_modify_creator=args.esdt_modify_creator, remove_role_nft_recreate=args.nft_recreate, - 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, ) @@ -1198,8 +1198,8 @@ def set_special_role_on_meta_esdt(args: Any): add_role_nft_burn=args.nft_burn, add_role_nft_add_quantity=args.nft_add_quantity, add_role_esdt_transfer_role=args.esdt_transfer_role, - 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, ) @@ -1226,8 +1226,8 @@ def unset_special_role_on_meta_esdt(args: Any): remove_role_nft_burn=args.nft_burn, remove_role_nft_add_quantity=args.nft_add_quantity, remove_role_esdt_transfer_role=args.esdt_transfer_role, - 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, ) @@ -1261,8 +1261,8 @@ def set_special_role_on_nft(args: Any): add_role_esdt_set_new_uri=args.esdt_set_new_uri, add_role_esdt_modify_creator=args.esdt_modify_creator, add_role_nft_recreate=args.nft_recreate, - 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, ) @@ -1295,8 +1295,8 @@ def unset_special_role_on_nft(args: Any): remove_role_esdt_set_new_uri=args.esdt_set_new_uri, remove_role_esdt_modify_creator=args.esdt_modify_creator, remove_role_nft_recreate=args.nft_recreate, - 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, ) @@ -1325,8 +1325,8 @@ def create_nft(args: Any): hash=args.hash, attributes=bytes.fromhex(args.attributes), uris=args.uris, - 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, ) @@ -1349,8 +1349,8 @@ def pause_token(args: Any): sender=sender, nonce=sender.nonce, token_identifier=args.token_identifier, - 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, ) @@ -1373,8 +1373,8 @@ def unpause_token(args: Any): sender=sender, nonce=sender.nonce, token_identifier=args.token_identifier, - 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, ) @@ -1398,8 +1398,8 @@ def freeze_token(args: Any): nonce=sender.nonce, token_identifier=args.token_identifier, user=Address.new_from_bech32(args.user), - 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, ) @@ -1423,8 +1423,8 @@ def unfreeze_token(args: Any): nonce=sender.nonce, token_identifier=args.token_identifier, user=Address.new_from_bech32(args.user), - 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, ) @@ -1448,8 +1448,8 @@ def wipe_token(args: Any): nonce=sender.nonce, token_identifier=args.token_identifier, user=Address.new_from_bech32(args.user), - 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, ) @@ -1473,8 +1473,8 @@ def local_mint(args: Any): nonce=sender.nonce, token_identifier=args.token_identifier, supply_to_mint=args.supply_to_mint, - 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, ) @@ -1498,8 +1498,8 @@ def local_burn(args: Any): nonce=sender.nonce, token_identifier=args.token_identifier, supply_to_burn=args.supply_to_burn, - 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, ) @@ -1524,8 +1524,8 @@ def update_attributes(args: Any): token_identifier=args.token_identifier, token_nonce=args.token_nonce, attributes=bytes.fromhex(args.attributes), - 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, ) @@ -1550,8 +1550,8 @@ def add_quantity(args: Any): token_identifier=args.token_identifier, token_nonce=args.token_nonce, quantity_to_add=args.quantity, - 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, ) @@ -1576,8 +1576,8 @@ def burn_quantity(args: Any): token_identifier=args.token_identifier, token_nonce=args.token_nonce, quantity_to_burn=args.quantity, - 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, ) @@ -1602,8 +1602,8 @@ def modify_royalties(args: Any): token_identifier=args.token_identifier, token_nonce=args.token_nonce, new_royalties=args.royalties, - 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, ) @@ -1628,8 +1628,8 @@ def set_new_uris(args: Any): token_identifier=args.token_identifier, token_nonce=args.token_nonce, new_uris=args.uris, - 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, ) @@ -1653,8 +1653,8 @@ def modify_creator(args: Any): nonce=sender.nonce, token_identifier=args.token_identifier, token_nonce=args.token_nonce, - 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, ) @@ -1683,8 +1683,8 @@ def update_metadata(args: Any): new_hash=args.hash, new_attributes=bytes.fromhex(args.attributes), new_uris=args.uris, - 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, ) @@ -1713,8 +1713,8 @@ def nft_metadata_recreate(args: Any): new_hash=args.hash, new_attributes=bytes.fromhex(args.attributes), new_uris=args.uris, - 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, ) @@ -1737,8 +1737,8 @@ def change_to_dynamic(args: Any): sender=sender, nonce=sender.nonce, token_identifier=args.token_identifier, - 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, ) @@ -1761,8 +1761,8 @@ def update_token_id(args: Any): sender=sender, nonce=sender.nonce, token_identifier=args.token_identifier, - 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, ) @@ -1790,8 +1790,8 @@ def register_dynamic_token(args: Any): token_ticker=args.token_ticker, token_type=token_type, denominator=args.denominator, - 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, ) @@ -1819,8 +1819,8 @@ def register_dynamic_and_set_all_roles(args: Any): token_ticker=args.token_ticker, token_type=token_type, denominator=args.denominator, - 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, ) @@ -1844,8 +1844,8 @@ def transfer_ownership(args: Any): nonce=sender.nonce, token_identifier=args.token_identifier, new_owner=Address.new_from_bech32(args.new_owner), - 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, ) @@ -1870,8 +1870,8 @@ def freeze_single_nft(args: Any): token_identifier=args.token_identifier, token_nonce=args.token_nonce, user=Address.new_from_bech32(args.user), - 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, ) @@ -1896,8 +1896,8 @@ def unfreeze_single_nft(args: Any): token_identifier=args.token_identifier, token_nonce=args.token_nonce, user=Address.new_from_bech32(args.user), - 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, ) @@ -1921,8 +1921,8 @@ def change_sft_to_meta_esdt(args: Any): nonce=sender.nonce, collection=args.collection, num_decimals=args.decimals, - 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, ) @@ -1946,8 +1946,8 @@ def transfer_nft_create_role(args: Any): nonce=sender.nonce, token_identifier=args.token_identifier, user=Address.new_from_bech32(args.user), - 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, ) @@ -1970,8 +1970,8 @@ def stop_nft_creation(args: Any): sender=sender, nonce=sender.nonce, token_identifier=args.token_identifier, - 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, ) @@ -1996,8 +1996,8 @@ def wipe_single_nft(args: Any): token_identifier=args.token_identifier, token_nonce=args.token_nonce, user=Address.new_from_bech32(args.user), - 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, ) @@ -2022,8 +2022,8 @@ def add_uris(args: Any): token_identifier=args.token_identifier, token_nonce=args.token_nonce, uris=args.uris, - 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, ) From 00f909791d57413b10dcc1e09d0b5853074146d8 Mon Sep 17 00:00:00 2001 From: Alexandru Popenta Date: Tue, 23 Sep 2025 14:25:21 +0300 Subject: [PATCH 2/3] remove localnet smoke test --- .github/workflows/test-localnet-tests.yml | 8 +-- .github/workflows/test-localnet.yml | 84 ----------------------- 2 files changed, 4 insertions(+), 88 deletions(-) delete mode 100644 .github/workflows/test-localnet.yml diff --git a/.github/workflows/test-localnet-tests.yml b/.github/workflows/test-localnet-tests.yml index 5ba77048..5f64fcc8 100644 --- a/.github/workflows/test-localnet-tests.yml +++ b/.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 diff --git a/.github/workflows/test-localnet.yml b/.github/workflows/test-localnet.yml deleted file mode 100644 index 9f3f063d..00000000 --- a/.github/workflows/test-localnet.yml +++ /dev/null @@ -1,84 +0,0 @@ -name: Test localnet - -on: - pull_request: - branches: [main, feat/*] - workflow_dispatch: - -permissions: - contents: read - -env: - BRANCH_NAME: ${{ github.head_ref || github.ref_name }} - -jobs: - localnet: - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-latest, macos-latest] - python-version: [3.11] - - steps: - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 - with: - python-version: ${{ matrix.python-version }} - - - uses: actions/checkout@v2 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 - with: - python-version: ${{ matrix.python-version }} - - - name: Install dependencies - run: | - python3 -m pip install --upgrade pip - pip3 install -r requirements.txt - - - name: Smoke test (with resolution == remote) - run: | - mkdir -p ~/multiversx-sdk - export PYTHONPATH=. - python3 -m multiversx_sdk_cli.cli config set github_api_token ${{ secrets.GITHUB_TOKEN }} - python3 -m multiversx_sdk_cli.cli localnet prerequisites --configfile=./multiversx_sdk_cli/tests/testdata/localnet_with_resolution_remote.toml - python3 -m multiversx_sdk_cli.cli localnet build --configfile=./multiversx_sdk_cli/tests/testdata/localnet_with_resolution_remote.toml - - # "Go" and artifacts from "GOPATH/pkg/mod" are not needed anymore. - sudo rm -rf ~/multiversx-sdk/golang - - python3 -m multiversx_sdk_cli.cli localnet clean --configfile=./multiversx_sdk_cli/tests/testdata/localnet_with_resolution_remote.toml - python3 -m multiversx_sdk_cli.cli localnet config --configfile=./multiversx_sdk_cli/tests/testdata/localnet_with_resolution_remote.toml - python3 -m multiversx_sdk_cli.cli localnet start --configfile=./multiversx_sdk_cli/tests/testdata/localnet_with_resolution_remote.toml --stop-after-seconds=120 - - if grep -r --include=\*.log "started committing block" ./localnet; then - echo "The localnet processed blocks successfully." - else - echo "The localnet failed to process blocks." - exit 1 - fi - - - name: Smoke test (with resolution == local) - run: | - mkdir -p ~/multiversx-sdk/sandbox - export PYTHONPATH=. - - git clone https://github.com/multiversx/mx-chain-go --branch=master --single-branch ~/multiversx-sdk/sandbox/mx-chain-go - git clone https://github.com/multiversx/mx-chain-proxy-go --branch=master --single-branch ~/multiversx-sdk/sandbox/mx-chain-proxy-go - - python3 -m multiversx_sdk_cli.cli localnet prerequisites --configfile=./multiversx_sdk_cli/tests/testdata/localnet_with_resolution_local.toml - python3 -m multiversx_sdk_cli.cli localnet build --configfile=./multiversx_sdk_cli/tests/testdata/localnet_with_resolution_local.toml - - # "Go" and artifacts from "GOPATH/pkg/mod" are not needed anymore. - sudo rm -rf ~/multiversx-sdk/golang - - python3 -m multiversx_sdk_cli.cli localnet clean --configfile=./multiversx_sdk_cli/tests/testdata/localnet_with_resolution_local.toml - python3 -m multiversx_sdk_cli.cli localnet config --configfile=./multiversx_sdk_cli/tests/testdata/localnet_with_resolution_local.toml - python3 -m multiversx_sdk_cli.cli localnet start --configfile=./multiversx_sdk_cli/tests/testdata/localnet_with_resolution_local.toml --stop-after-seconds=120 - - if grep -r --include=\*.log "started committing block" ./localnet; then - echo "The localnet processed blocks successfully." - else - echo "The localnet failed to process blocks." - exit 1 - fi From b2776e3df05d6ed521bb9d119519efccfc766ecb Mon Sep 17 00:00:00 2001 From: Alexandru Popenta Date: Tue, 23 Sep 2025 14:25:39 +0300 Subject: [PATCH 3/3] set gas limit for tests --- .../tests/test_cli_validators_localnet.py | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/multiversx_sdk_cli/tests/test_cli_validators_localnet.py b/multiversx_sdk_cli/tests/test_cli_validators_localnet.py index c54a2545..18758752 100644 --- a/multiversx_sdk_cli/tests/test_cli_validators_localnet.py +++ b/multiversx_sdk_cli/tests/test_cli_validators_localnet.py @@ -32,6 +32,8 @@ def test_stake(): "localnet", "--proxy", "http://127.0.0.1:7950", + "--gas-limit", + "60000000", ] ) assert return_code == 0 @@ -54,6 +56,8 @@ def test_stake(): "--proxy", "http://127.0.0.1:7950", "--nonce=0", + "--gas-limit", + "60000000", ] ) assert return_code == 0 @@ -75,6 +79,8 @@ def test_stake_top_up(): "localnet", "--proxy", "http://127.0.0.1:7950", + "--gas-limit", + "60000000", ] ) assert return_code == 0 @@ -95,6 +101,8 @@ def test_unstake(): "localnet", "--proxy", "http://127.0.0.1:7950", + "--gas-limit", + "60000000", ] ) assert return_code == 0 @@ -115,6 +123,8 @@ def test_unbond(): "localnet", "--proxy", "http://127.0.0.1:7950", + "--gas-limit", + "60000000", ] ) assert return_code == 0 @@ -137,6 +147,8 @@ def test_unjail(): "localnet", "--proxy", "http://127.0.0.1:7950", + "--gas-limit", + "60000000", ] ) assert return_code == 0 @@ -157,6 +169,8 @@ def test_change_reward_address(): "localnet", "--proxy", "http://127.0.0.1:7950", + "--gas-limit", + "60000000", ] ) assert return_code == 0 @@ -177,6 +191,8 @@ def test_unstake_nodes(): "localnet", "--proxy", "http://127.0.0.1:7950", + "--gas-limit", + "60000000", ] ) assert return_code == 0 @@ -197,6 +213,8 @@ def test_unstake_tokens(): "localnet", "--proxy", "http://127.0.0.1:7950", + "--gas-limit", + "60000000", ] ) assert return_code == 0 @@ -217,6 +235,8 @@ def test_unbond_nodes(): "localnet", "--proxy", "http://127.0.0.1:7950", + "--gas-limit", + "60000000", ] ) assert return_code == 0 @@ -237,6 +257,8 @@ def test_unbond_tokens(): "localnet", "--proxy", "http://127.0.0.1:7950", + "--gas-limit", + "60000000", ] ) assert return_code == 0 @@ -255,6 +277,8 @@ def test_clean_registration_data(): "localnet", "--proxy", "http://127.0.0.1:7950", + "--gas-limit", + "60000000", ] ) assert return_code == 0 @@ -275,6 +299,8 @@ def test_re_stake_unstaked_nodes(): "localnet", "--proxy", "http://127.0.0.1:7950", + "--gas-limit", + "60000000", ] ) assert return_code == 0