From 7450e63c6bd52ff7f36ec16275a68c3c0298ff2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= Date: Tue, 20 Aug 2024 12:02:38 +0300 Subject: [PATCH] Tests and formatting. --- .vscode/settings.json | 6 ++ cmd/rosetta/testdata/custom-currencies.json | 16 ++-- .../testdata/blocks_with_esdt_burn.json | 6 +- .../testdata/blocks_with_esdt_mint.json | 6 +- .../transactionEventsController_test.go | 29 ++++++ systemtests/adder.wasm | Bin 0 -> 697 bytes systemtests/check_with_mesh_cli.py | 14 ++- systemtests/config.py | 43 ++++++++- systemtests/constants.py | 4 +- systemtests/dummy.wasm | Bin 0 -> 115 bytes systemtests/mesh_cli_config/check-data.json | 86 +++++++++--------- .../devnet-construction-custom.json | 84 ++++++++--------- .../devnet-construction-native.json | 62 ++++++------- .../testnet-construction-custom.json | 84 ++++++++--------- .../testnet-construction-custom.ros | 6 +- .../testnet-construction-native.json | 62 ++++++------- .../devnet-custom-currencies.json | 8 +- .../localnet-custom-currencies.json | 1 + .../mainnet-custom-currencies.json | 24 ++--- .../testnet-custom-currencies.json | 8 +- 20 files changed, 311 insertions(+), 238 deletions(-) create mode 100644 .vscode/settings.json create mode 100644 systemtests/adder.wasm create mode 100755 systemtests/dummy.wasm create mode 100644 systemtests/rosetta_config/localnet-custom-currencies.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..a038765c --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,6 @@ +{ + "[json]": { + "editor.tabSize": 4 + }, + "prettier" +} diff --git a/cmd/rosetta/testdata/custom-currencies.json b/cmd/rosetta/testdata/custom-currencies.json index 8a90dd3c..9fcd369b 100644 --- a/cmd/rosetta/testdata/custom-currencies.json +++ b/cmd/rosetta/testdata/custom-currencies.json @@ -1,10 +1,10 @@ [ - { - "symbol": "WEGLD-bd4d79", - "decimals": 18 - }, - { - "symbol": "USDC-c76f1f", - "decimals": 6 - } + { + "symbol": "WEGLD-bd4d79", + "decimals": 18 + }, + { + "symbol": "USDC-c76f1f", + "decimals": 6 + } ] diff --git a/server/services/testdata/blocks_with_esdt_burn.json b/server/services/testdata/blocks_with_esdt_burn.json index fe31dd29..5d9fa744 100644 --- a/server/services/testdata/blocks_with_esdt_burn.json +++ b/server/services/testdata/blocks_with_esdt_burn.json @@ -16,11 +16,7 @@ { "address": "erd1r69gk66fmedhhcg24g2c5kn2f2a5k4kvpr6jfw67dn2lyydd8cfswy6ede", "identifier": "ESDTLocalBurn", - "topics": [ - "VEVTVC00ODRmYTE=", - "", - "Mg==" - ], + "topics": ["VEVTVC00ODRmYTE=", "", "Mg=="], "data": null }, { diff --git a/server/services/testdata/blocks_with_esdt_mint.json b/server/services/testdata/blocks_with_esdt_mint.json index e83231af..b10d5ea7 100644 --- a/server/services/testdata/blocks_with_esdt_mint.json +++ b/server/services/testdata/blocks_with_esdt_mint.json @@ -16,11 +16,7 @@ { "address": "erd1r69gk66fmedhhcg24g2c5kn2f2a5k4kvpr6jfw67dn2lyydd8cfswy6ede", "identifier": "ESDTLocalMint", - "topics": [ - "VEVTVC00ODRmYTE=", - "", - "yA==" - ], + "topics": ["VEVTVC00ODRmYTE=", "", "yA=="], "data": null }, { diff --git a/server/services/transactionEventsController_test.go b/server/services/transactionEventsController_test.go index ae96c734..b977ad98 100644 --- a/server/services/transactionEventsController_test.go +++ b/server/services/transactionEventsController_test.go @@ -1,6 +1,7 @@ package services import ( + "encoding/hex" "testing" "github.com/multiversx/mx-chain-core-go/data/transaction" @@ -174,6 +175,34 @@ func TestTransactionEventsController_ExtractEvents(t *testing.T) { networkProvider := testscommon.NewNetworkProviderMock() controller := newTransactionEventsController(networkProvider) + t.Run("SCDeploy", func(t *testing.T) { + topic0, _ := hex.DecodeString("00000000000000000500def8dad1161f8f0c38f3e6e73515ed81058f0b5606b8") + topic1, _ := hex.DecodeString("5cf4abc83e50c5309d807fc3f676988759a1e301001bc9a0265804f42af806b8") + topic2, _ := hex.DecodeString("be5560e0d7d3857d438a3678269039f8f80ded90dcbc2cda268a0847ba9cb379") + + tx := &transaction.ApiTransactionResult{ + Logs: &transaction.ApiLogs{ + Events: []*transaction.Events{ + { + Identifier: "SCDeploy", + Address: "erd1qqqqqqqqqqqqqpgqmmud45gkr78scw8numnn290dsyzc7z6kq6uqw2jcza", + Topics: [][]byte{ + topic0, + topic1, + topic2, + }, + }, + }, + }, + } + + events, err := controller.extractEventSCDeploy(tx) + require.NoError(t, err) + require.Len(t, events, 1) + require.Equal(t, "erd1qqqqqqqqqqqqqpgqmmud45gkr78scw8numnn290dsyzc7z6kq6uqw2jcza", events[0].contractAddress) + require.Equal(t, "erd1tn62hjp72rznp8vq0lplva5csav6rccpqqdungpxtqz0g2hcq6uq9k4cc6", events[0].deployerAddress) + }) + t.Run("ESDTNFTCreate", func(t *testing.T) { tx := &transaction.ApiTransactionResult{ Logs: &transaction.ApiLogs{ diff --git a/systemtests/adder.wasm b/systemtests/adder.wasm new file mode 100644 index 0000000000000000000000000000000000000000..67af5e5cf2fa468f4fbbb1476d191b4ad48eae8b GIT binary patch literal 697 zcmZuvO^?$s5S_8JZ8l~b@3sPU#UbPbCvJ!%sYDSHTCKEjPTa;#t2W8XNkBcNKY=R} z2YwHKs*IBs35i2I_Iq#Md?=u*9034dxd}i5*e0xP`x6puA>nQJw!s3}vhPfAU3{G` zHrdCb{-EnGMYYKaokk{Wa$VHGE$?T#zH9O`SOHp8SgG2*H>NbbZko@U)k>SWDf3xp zdG-TlGsY+Wp)QTev< zGk^sr{fzTXv8mR7+j1;**;7%P!hj18(cwe8NpeHr1D~}J{W`ef6o&WiAlG?m_6!`d ztKoV;3wmgBxZ#RS#_m$>b~Cly!erPyW=5qNuDv);Rjp!Oq#Q&XueExN7pl@6z2E4K z5ZegklMo~XAg1>D^WfU=C4&gJA-rLhnSjIq=FU4`L int: configuration = CONFIGURATIONS[args.network] process_rosetta = run_rosetta(configuration) - process_adapter = run_proxy_to_observer_adapter(configuration) + process_adapter = optionally_run_proxy_to_observer_adapter(configuration) process_checker = run_mesh_cli(mode, configuration) # Handle termination signals def signal_handler(sig: Any, frame: Any): process_rosetta.kill() - process_adapter.kill() + process_adapter.kill() if process_adapter else None process_checker.kill() sys.exit(1) @@ -39,7 +39,7 @@ def signal_handler(sig: Any, frame: Any): exit_code = process_checker.wait() process_rosetta.kill() - process_adapter.kill() + process_adapter.kill() if process_adapter else None time.sleep(1) @@ -61,7 +61,7 @@ def run_rosetta(configuration: Configuration): command = [ str(constants.PATH_ROSETTA), f"--port={constants.PORT_ROSETTA}", - f"--observer-http-url=http://localhost:{constants.PORT_OBSERVER_SURROGATE}", + f"--observer-http-url={constants.URL_OBSERVER_SURROGATE}", f"--observer-actual-shard={configuration.network_shard}", f"--network-id={configuration.network_id}", f"--network-name={configuration.network_name}", @@ -74,7 +74,11 @@ def run_rosetta(configuration: Configuration): return subprocess.Popen(command) -def run_proxy_to_observer_adapter(configuration: Configuration): +def optionally_run_proxy_to_observer_adapter(configuration: Configuration) -> Any: + if configuration.observer_url: + # If observer URL is provided, we don't need the adapter. + return None + command = [ str(constants.PATH_PROXY_TO_OBSERVER_ADAPTER), f"--proxy={configuration.proxy_url}", diff --git a/systemtests/config.py b/systemtests/config.py index 2a4b2a34..6f40fa4c 100644 --- a/systemtests/config.py +++ b/systemtests/config.py @@ -1,4 +1,6 @@ +import os from dataclasses import dataclass +from typing import List @dataclass @@ -9,11 +11,16 @@ class Configuration: native_currency: str config_file_custom_currencies: str num_historical_epochs: int + observer_url: str proxy_url: str check_construction_native_configuration_file: str check_construction_custom_configuration_file: str check_data_configuration_file: str check_data_directory: str + known_contracts: List[str] + explorer_url: str + sponsor_secret_key: bytes = bytes.fromhex(os.environ.get("SPONSOR_SECRET_KEY", "")) + users_mnemonic: str = os.environ.get("USERS_MNEMONIC", "") CONFIGURATIONS = { @@ -24,11 +31,18 @@ class Configuration: native_currency="EGLD", config_file_custom_currencies="systemtests/rosetta_config/devnet-custom-currencies.json", num_historical_epochs=2, + observer_url="", proxy_url="https://devnet-gateway.multiversx.com", check_construction_native_configuration_file="systemtests/mesh_cli_config/devnet-construction-native.json", check_construction_custom_configuration_file="systemtests/mesh_cli_config/devnet-construction-custom.json", check_data_configuration_file="systemtests/mesh_cli_config/check-data.json", check_data_directory="systemtests/devnet-data", + known_contracts=[ + "erd1qqqqqqqqqqqqqpgqagjekf5mxv86hy5c62vvtug5vc6jmgcsq6uq8reras", + "erd1qqqqqqqqqqqqqpgq89t5xm4x04tnt9lv747wdrsaycf3rcwcggzsa7crse", + "erd1qqqqqqqqqqqqqpgqeesfamasje5zru7ku79m8p4xqfqnywvqxj0qhtyzdr" + ], + explorer_url="https://devnet-explorer.multiversx.com", ), "testnet": Configuration( network_shard=0, @@ -36,11 +50,38 @@ class Configuration: network_name="untitled", native_currency="EGLD", config_file_custom_currencies="systemtests/rosetta_config/testnet-custom-currencies.json", - num_historical_epochs=2, + num_historical_epochs=1, + observer_url="", proxy_url="https://testnet-gateway.multiversx.com", check_construction_native_configuration_file="systemtests/mesh_cli_config/testnet-construction-native.json", check_construction_custom_configuration_file="systemtests/mesh_cli_config/testnet-construction-custom.json", check_data_configuration_file="systemtests/mesh_cli_config/check-data.json", check_data_directory="systemtests/testnet-data", + known_contracts=[ + "erd1qqqqqqqqqqqqqpgqagjekf5mxv86hy5c62vvtug5vc6jmgcsq6uq8reras", + "erd1qqqqqqqqqqqqqpgq89t5xm4x04tnt9lv747wdrsaycf3rcwcggzsa7crse", + "erd1qqqqqqqqqqqqqpgqeesfamasje5zru7ku79m8p4xqfqnywvqxj0qhtyzdr" + ], + explorer_url="https://testnet-explorer.multiversx.com", + ), + "localnet": Configuration( + network_shard=0, + network_id="localnet", + network_name="untitled", + native_currency="EGLD", + config_file_custom_currencies="systemtests/rosetta_config/localnet-custom-currencies.json", + num_historical_epochs=2, + observer_url="", + proxy_url="http://localhost:7950", + check_construction_native_configuration_file="systemtests/mesh_cli_config/localnet-construction-native.json", + check_construction_custom_configuration_file="systemtests/mesh_cli_config/localnet-construction-custom.json", + check_data_configuration_file="systemtests/mesh_cli_config/check-data.json", + check_data_directory="systemtests/localnet-data", + known_contracts=[ + "erd1qqqqqqqqqqqqqpgqagjekf5mxv86hy5c62vvtug5vc6jmgcsq6uq8reras", + "erd1qqqqqqqqqqqqqpgq89t5xm4x04tnt9lv747wdrsaycf3rcwcggzsa7crse", + "erd1qqqqqqqqqqqqqpgqeesfamasje5zru7ku79m8p4xqfqnywvqxj0qhtyzdr" + ], + explorer_url="", ), } diff --git a/systemtests/constants.py b/systemtests/constants.py index 777c19f3..68e743ed 100644 --- a/systemtests/constants.py +++ b/systemtests/constants.py @@ -4,5 +4,5 @@ PATH_ROSETTA = PATH_REPOSITORY / "cmd" / "rosetta" / "rosetta" PATH_PROXY_TO_OBSERVER_ADAPTER = PATH_REPOSITORY / "systemtests" / "proxyToObserverAdapter" PORT_ROSETTA = 7091 -PORT_OBSERVER_SURROGATE = 8080 -ADAPTER_DELAY_IN_MILLISECONDS = 100 +URL_OBSERVER_SURROGATE = "http://localhost:8080" +ADAPTER_DELAY_IN_MILLISECONDS = 80 diff --git a/systemtests/dummy.wasm b/systemtests/dummy.wasm new file mode 100755 index 0000000000000000000000000000000000000000..3c36df962a52b73fa104b51e38b89b635f769a43 GIT binary patch literal 115 zcmWN{u?~VT6ouh)?yW%RLi7n-oejG_2_zKl(3Sw2uqdOCZU21ZkA4XRz)CuP&;fFy zy7;y}uI+X7(JxOxjgmYlAw|V6Z~M>K@@$IWLYg;$$>R!^ujw)OgM;Xp60|<5z-Be> JmuAnw{sGKc6}kWb literal 0 HcmV?d00001 diff --git a/systemtests/mesh_cli_config/check-data.json b/systemtests/mesh_cli_config/check-data.json index 85e0c701..a50018e1 100644 --- a/systemtests/mesh_cli_config/check-data.json +++ b/systemtests/mesh_cli_config/check-data.json @@ -1,46 +1,46 @@ { - "network": { - "blockchain": "MultiversX", - "network": "untitled" - }, - "http_timeout": 30, - "max_retries": 10, - "retry_elapsed_time": 20, - "max_online_connections": 8, - "max_sync_concurrency": 4, - "tip_delay": 10, - "max_reorg_depth": 100, - "log_configuration": false, - "compression_disabled": false, - "l0_in_memory_enabled": false, - "error_stack_trace_disabled": false, - "coin_supported": false, - "construction": null, - "data": { - "active_reconciliation_concurrency": 8, - "inactive_reconciliation_concurrency": 1, - "inactive_reconciliation_frequency": 8, - "log_blocks": false, - "log_transactions": true, - "log_balance_changes": true, - "log_reconciliations": true, - "ignore_reconciliation_error": false, - "reconciliation_disabled": false, - "reconciliation_drain_disabled": false, - "inactive_discrepancy_search_disabled": false, - "balance_tracking_disabled": false, - "coin_tracking_disabled": false, - "status_port": 9091, - "results_output_file": "", - "pruning_block_disabled": false, - "pruning_balance_disabled": false, - "initial_balance_fetch_disabled": false, - "historical_balance_disabled": false, - "end_conditions": { - "reconciliation_coverage": { - "coverage": 1, - "from_tip": true - } + "network": { + "blockchain": "MultiversX", + "network": "untitled" + }, + "http_timeout": 30, + "max_retries": 10, + "retry_elapsed_time": 20, + "max_online_connections": 8, + "max_sync_concurrency": 4, + "tip_delay": 10, + "max_reorg_depth": 100, + "log_configuration": false, + "compression_disabled": false, + "l0_in_memory_enabled": false, + "error_stack_trace_disabled": false, + "coin_supported": false, + "construction": null, + "data": { + "active_reconciliation_concurrency": 8, + "inactive_reconciliation_concurrency": 1, + "inactive_reconciliation_frequency": 8, + "log_blocks": false, + "log_transactions": true, + "log_balance_changes": true, + "log_reconciliations": true, + "ignore_reconciliation_error": false, + "reconciliation_disabled": false, + "reconciliation_drain_disabled": false, + "inactive_discrepancy_search_disabled": false, + "balance_tracking_disabled": false, + "coin_tracking_disabled": false, + "status_port": 9091, + "results_output_file": "", + "pruning_block_disabled": false, + "pruning_balance_disabled": false, + "initial_balance_fetch_disabled": false, + "historical_balance_disabled": false, + "end_conditions": { + "reconciliation_coverage": { + "coverage": 1, + "from_tip": true + } + } } - } } diff --git a/systemtests/mesh_cli_config/devnet-construction-custom.json b/systemtests/mesh_cli_config/devnet-construction-custom.json index e7400b75..1b8b88da 100644 --- a/systemtests/mesh_cli_config/devnet-construction-custom.json +++ b/systemtests/mesh_cli_config/devnet-construction-custom.json @@ -1,46 +1,46 @@ { - "network": { - "blockchain": "MultiversX", - "network": "untitled" - }, - "data_directory": "", - "http_timeout": 200, - "max_retries": 1, - "max_online_connections": 120, - "max_sync_concurrency": 1, - "construction": { - "end_conditions": { - "transfer": 1 + "network": { + "blockchain": "MultiversX", + "network": "untitled" }, - "stale_depth": 10, - "broadcast_limit": 5, - "constructor_dsl_file": "devnet-construction-custom.ros", - "prefunded_accounts": [ - { - "account_identifier": { - "address": "erd1ldjsdetjvegjdnda0qw2h62kq6rpvrklkc5pw9zxm0nwulfhtyqqtyc4vq" + "data_directory": "", + "http_timeout": 200, + "max_retries": 1, + "max_online_connections": 120, + "max_sync_concurrency": 1, + "construction": { + "end_conditions": { + "transfer": 1 }, - "privkey": "3e4e89e501eb542c12403fb15c52479e8721f2f4dedc3b3ef0f3b47b37de006c", - "curve_type": "edwards25519", - "currency": { - "symbol": "ROSETTA-2c0a37", - "decimals": 2 - } - }, - { - "account_identifier": { - "address": "erd1ldjsdetjvegjdnda0qw2h62kq6rpvrklkc5pw9zxm0nwulfhtyqqtyc4vq" - }, - "privkey": "3e4e89e501eb542c12403fb15c52479e8721f2f4dedc3b3ef0f3b47b37de006c", - "curve_type": "edwards25519", - "currency": { - "symbol": "EGLD", - "decimals": 18 - } - } - ] - }, - "data": { - "inactive_discrepancy_search_disabled": true - } + "stale_depth": 10, + "broadcast_limit": 5, + "constructor_dsl_file": "devnet-construction-custom.ros", + "prefunded_accounts": [ + { + "account_identifier": { + "address": "erd1ldjsdetjvegjdnda0qw2h62kq6rpvrklkc5pw9zxm0nwulfhtyqqtyc4vq" + }, + "privkey": "3e4e89e501eb542c12403fb15c52479e8721f2f4dedc3b3ef0f3b47b37de006c", + "curve_type": "edwards25519", + "currency": { + "symbol": "ROSETTA-2c0a37", + "decimals": 2 + } + }, + { + "account_identifier": { + "address": "erd1ldjsdetjvegjdnda0qw2h62kq6rpvrklkc5pw9zxm0nwulfhtyqqtyc4vq" + }, + "privkey": "3e4e89e501eb542c12403fb15c52479e8721f2f4dedc3b3ef0f3b47b37de006c", + "curve_type": "edwards25519", + "currency": { + "symbol": "EGLD", + "decimals": 18 + } + } + ] + }, + "data": { + "inactive_discrepancy_search_disabled": true + } } diff --git a/systemtests/mesh_cli_config/devnet-construction-native.json b/systemtests/mesh_cli_config/devnet-construction-native.json index 711b1c6a..2568c1ae 100644 --- a/systemtests/mesh_cli_config/devnet-construction-native.json +++ b/systemtests/mesh_cli_config/devnet-construction-native.json @@ -1,35 +1,35 @@ { - "network": { - "blockchain": "MultiversX", - "network": "untitled" - }, - "data_directory": "", - "http_timeout": 200, - "max_retries": 1, - "max_online_connections": 120, - "max_sync_concurrency": 1, - "construction": { - "end_conditions": { - "transfer": 1 + "network": { + "blockchain": "MultiversX", + "network": "untitled" }, - "stale_depth": 10, - "broadcast_limit": 5, - "constructor_dsl_file": "devnet-construction-native.ros", - "prefunded_accounts": [ - { - "account_identifier": { - "address": "erd1ldjsdetjvegjdnda0qw2h62kq6rpvrklkc5pw9zxm0nwulfhtyqqtyc4vq" + "data_directory": "", + "http_timeout": 200, + "max_retries": 1, + "max_online_connections": 120, + "max_sync_concurrency": 1, + "construction": { + "end_conditions": { + "transfer": 1 }, - "privkey": "3e4e89e501eb542c12403fb15c52479e8721f2f4dedc3b3ef0f3b47b37de006c", - "curve_type": "edwards25519", - "currency": { - "symbol": "EGLD", - "decimals": 18 - } - } - ] - }, - "data": { - "inactive_discrepancy_search_disabled": true - } + "stale_depth": 10, + "broadcast_limit": 5, + "constructor_dsl_file": "devnet-construction-native.ros", + "prefunded_accounts": [ + { + "account_identifier": { + "address": "erd1ldjsdetjvegjdnda0qw2h62kq6rpvrklkc5pw9zxm0nwulfhtyqqtyc4vq" + }, + "privkey": "3e4e89e501eb542c12403fb15c52479e8721f2f4dedc3b3ef0f3b47b37de006c", + "curve_type": "edwards25519", + "currency": { + "symbol": "EGLD", + "decimals": 18 + } + } + ] + }, + "data": { + "inactive_discrepancy_search_disabled": true + } } diff --git a/systemtests/mesh_cli_config/testnet-construction-custom.json b/systemtests/mesh_cli_config/testnet-construction-custom.json index 1c93e0d5..9b3441d9 100644 --- a/systemtests/mesh_cli_config/testnet-construction-custom.json +++ b/systemtests/mesh_cli_config/testnet-construction-custom.json @@ -1,46 +1,46 @@ { - "network": { - "blockchain": "MultiversX", - "network": "untitled" - }, - "data_directory": "", - "http_timeout": 200, - "max_retries": 1, - "max_online_connections": 120, - "max_sync_concurrency": 1, - "construction": { - "end_conditions": { - "transfer": 1 + "network": { + "blockchain": "MultiversX", + "network": "untitled" }, - "stale_depth": 10, - "broadcast_limit": 5, - "constructor_dsl_file": "testnet-construction-custom.ros", - "prefunded_accounts": [ - { - "account_identifier": { - "address": "erd1ldjsdetjvegjdnda0qw2h62kq6rpvrklkc5pw9zxm0nwulfhtyqqtyc4vq" + "data_directory": "", + "http_timeout": 200, + "max_retries": 1, + "max_online_connections": 120, + "max_sync_concurrency": 1, + "construction": { + "end_conditions": { + "transfer": 1 }, - "privkey": "3e4e89e501eb542c12403fb15c52479e8721f2f4dedc3b3ef0f3b47b37de006c", - "curve_type": "edwards25519", - "currency": { - "symbol": "ROSETTA-7783de", - "decimals": 4 - } - }, - { - "account_identifier": { - "address": "erd1ldjsdetjvegjdnda0qw2h62kq6rpvrklkc5pw9zxm0nwulfhtyqqtyc4vq" - }, - "privkey": "3e4e89e501eb542c12403fb15c52479e8721f2f4dedc3b3ef0f3b47b37de006c", - "curve_type": "edwards25519", - "currency": { - "symbol": "EGLD", - "decimals": 18 - } - } - ] - }, - "data": { - "inactive_discrepancy_search_disabled": true - } + "stale_depth": 10, + "broadcast_limit": 5, + "constructor_dsl_file": "testnet-construction-custom.ros", + "prefunded_accounts": [ + { + "account_identifier": { + "address": "erd1ldjsdetjvegjdnda0qw2h62kq6rpvrklkc5pw9zxm0nwulfhtyqqtyc4vq" + }, + "privkey": "3e4e89e501eb542c12403fb15c52479e8721f2f4dedc3b3ef0f3b47b37de006c", + "curve_type": "edwards25519", + "currency": { + "symbol": "ROSETTA-de9b08", + "decimals": 4 + } + }, + { + "account_identifier": { + "address": "erd1ldjsdetjvegjdnda0qw2h62kq6rpvrklkc5pw9zxm0nwulfhtyqqtyc4vq" + }, + "privkey": "3e4e89e501eb542c12403fb15c52479e8721f2f4dedc3b3ef0f3b47b37de006c", + "curve_type": "edwards25519", + "currency": { + "symbol": "EGLD", + "decimals": 18 + } + } + ] + }, + "data": { + "inactive_discrepancy_search_disabled": true + } } diff --git a/systemtests/mesh_cli_config/testnet-construction-custom.ros b/systemtests/mesh_cli_config/testnet-construction-custom.ros index fa70a322..3c6631b9 100644 --- a/systemtests/mesh_cli_config/testnet-construction-custom.ros +++ b/systemtests/mesh_cli_config/testnet-construction-custom.ros @@ -1,13 +1,13 @@ transfer(1){ transfer{ transfer.network = {"network":"untitled", "blockchain":"MultiversX"}; - custom_currency = {"symbol":"ROSETTA-7783de", "decimals":4}; + custom_currency = {"symbol":"ROSETTA-de9b08", "decimals":4}; sender = { "account_identifier": { "address": "erd1ldjsdetjvegjdnda0qw2h62kq6rpvrklkc5pw9zxm0nwulfhtyqqtyc4vq" }, "currency": { - "symbol": "ROSETTA-7783de", + "symbol": "ROSETTA-de9b08", "decimals": 4 } }; @@ -24,7 +24,7 @@ transfer(1){ "address": "erd1xtslmt67utuewwv8jsx729mxjxaa8dvyyzp7492hy99dl7hvcuqq30l98v" }, "currency": { - "symbol": "ROSETTA-7783de", + "symbol": "ROSETTA-de9b08", "decimals": 4 } }; diff --git a/systemtests/mesh_cli_config/testnet-construction-native.json b/systemtests/mesh_cli_config/testnet-construction-native.json index 2113da29..75c66677 100644 --- a/systemtests/mesh_cli_config/testnet-construction-native.json +++ b/systemtests/mesh_cli_config/testnet-construction-native.json @@ -1,35 +1,35 @@ { - "network": { - "blockchain": "MultiversX", - "network": "untitled" - }, - "data_directory": "", - "http_timeout": 200, - "max_retries": 1, - "max_online_connections": 120, - "max_sync_concurrency": 1, - "construction": { - "end_conditions": { - "transfer": 1 + "network": { + "blockchain": "MultiversX", + "network": "untitled" }, - "stale_depth": 10, - "broadcast_limit": 5, - "constructor_dsl_file": "testnet-construction-native.ros", - "prefunded_accounts": [ - { - "account_identifier": { - "address": "erd1ldjsdetjvegjdnda0qw2h62kq6rpvrklkc5pw9zxm0nwulfhtyqqtyc4vq" + "data_directory": "", + "http_timeout": 200, + "max_retries": 1, + "max_online_connections": 120, + "max_sync_concurrency": 1, + "construction": { + "end_conditions": { + "transfer": 1 }, - "privkey": "3e4e89e501eb542c12403fb15c52479e8721f2f4dedc3b3ef0f3b47b37de006c", - "curve_type": "edwards25519", - "currency": { - "symbol": "EGLD", - "decimals": 18 - } - } - ] - }, - "data": { - "inactive_discrepancy_search_disabled": true - } + "stale_depth": 10, + "broadcast_limit": 5, + "constructor_dsl_file": "testnet-construction-native.ros", + "prefunded_accounts": [ + { + "account_identifier": { + "address": "erd1ldjsdetjvegjdnda0qw2h62kq6rpvrklkc5pw9zxm0nwulfhtyqqtyc4vq" + }, + "privkey": "3e4e89e501eb542c12403fb15c52479e8721f2f4dedc3b3ef0f3b47b37de006c", + "curve_type": "edwards25519", + "currency": { + "symbol": "EGLD", + "decimals": 18 + } + } + ] + }, + "data": { + "inactive_discrepancy_search_disabled": true + } } diff --git a/systemtests/rosetta_config/devnet-custom-currencies.json b/systemtests/rosetta_config/devnet-custom-currencies.json index be7ce62e..b6161d1b 100644 --- a/systemtests/rosetta_config/devnet-custom-currencies.json +++ b/systemtests/rosetta_config/devnet-custom-currencies.json @@ -1,6 +1,6 @@ [ - { - "symbol": "ROSETTA-2c0a37", - "decimals": 2 - } + { + "symbol": "ROSETTA-2c0a37", + "decimals": 2 + } ] diff --git a/systemtests/rosetta_config/localnet-custom-currencies.json b/systemtests/rosetta_config/localnet-custom-currencies.json new file mode 100644 index 00000000..fe51488c --- /dev/null +++ b/systemtests/rosetta_config/localnet-custom-currencies.json @@ -0,0 +1 @@ +[] diff --git a/systemtests/rosetta_config/mainnet-custom-currencies.json b/systemtests/rosetta_config/mainnet-custom-currencies.json index 18cffb72..b2fb7bb6 100644 --- a/systemtests/rosetta_config/mainnet-custom-currencies.json +++ b/systemtests/rosetta_config/mainnet-custom-currencies.json @@ -1,14 +1,14 @@ [ - { - "symbol": "WEGLD-bd4d79", - "decimals": 18 - }, - { - "symbol": "MEX-455c57", - "decimals": 18 - }, - { - "symbol": "USDC-c76f1f", - "decimals": 6 - } + { + "symbol": "WEGLD-bd4d79", + "decimals": 18 + }, + { + "symbol": "MEX-455c57", + "decimals": 18 + }, + { + "symbol": "USDC-c76f1f", + "decimals": 6 + } ] diff --git a/systemtests/rosetta_config/testnet-custom-currencies.json b/systemtests/rosetta_config/testnet-custom-currencies.json index 6939ea7f..dd7aac14 100644 --- a/systemtests/rosetta_config/testnet-custom-currencies.json +++ b/systemtests/rosetta_config/testnet-custom-currencies.json @@ -1,6 +1,6 @@ [ - { - "symbol": "ROSETTA-7783de", - "decimals": 4 - } + { + "symbol": "ROSETTA-de9b08", + "decimals": 4 + } ]