Merge pull request #1846 from multiversx/chain-dir

`chain` directory
multiversx · Nov 6, 2024 · bb81524 · bb81524
2 parents b974bab + 9b1bf97
commit bb81524
Show file tree

Hide file tree

Showing 132 changed files with 12 additions and 13 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,6 +13,9 @@ members = [
   "framework/snippets",
   "framework/wasm-adapter",
 
+  "chain/core",
+  "chain/vm",
+
   "sdk/core",
   "sdk/dapp",
   "sdk/http",
@@ -23,9 +26,6 @@ members = [
   # "tools/plotter",
   "tools/interactor-system-func-calls/",
 
-  "vm-core",
-  "vm",
-
   "contracts/modules",
 
   "contracts/core/price-aggregator",

diff --git a/vm-core/Cargo.toml → chain/core/Cargo.toml b/vm-core/Cargo.toml → chain/core/Cargo.toml
@@ -21,5 +21,5 @@ bitflags = "=2.6.0"
 
 [dependencies.multiversx-sc-codec]
 version = "=0.21.0"
-path = "../data/codec"
+path = "../../data/codec"
 features = ["derive"]
diff --git a/vm-core/README.md → chain/core/README.md b/vm-core/README.md → chain/core/README.md
diff --git a/vm-core/src/builtin_func_names.rs → chain/core/src/builtin_func_names.rs b/vm-core/src/builtin_func_names.rs → chain/core/src/builtin_func_names.rs
diff --git a/vm-core/src/lib.rs → chain/core/src/lib.rs b/vm-core/src/lib.rs → chain/core/src/lib.rs
diff --git a/vm-core/src/types.rs → chain/core/src/types.rs b/vm-core/src/types.rs → chain/core/src/types.rs
diff --git a/vm-core/src/types/address.rs → chain/core/src/types/address.rs b/vm-core/src/types/address.rs → chain/core/src/types/address.rs
diff --git a/vm-core/src/types/boxed_bytes.rs → chain/core/src/types/boxed_bytes.rs b/vm-core/src/types/boxed_bytes.rs → chain/core/src/types/boxed_bytes.rs
diff --git a/vm-core/src/types/flags.rs → chain/core/src/types/flags.rs b/vm-core/src/types/flags.rs → chain/core/src/types/flags.rs
diff --git a/vm-core/src/types/flags/code_metadata.rs → chain/core/src/types/flags/code_metadata.rs b/vm-core/src/types/flags/code_metadata.rs → chain/core/src/types/flags/code_metadata.rs
diff --git a/vm-core/src/types/flags/esdt_local_role.rs → ...n/core/src/types/flags/esdt_local_role.rs b/vm-core/src/types/flags/esdt_local_role.rs → ...n/core/src/types/flags/esdt_local_role.rs
diff --git a/.../src/types/flags/esdt_local_role_flags.rs → .../src/types/flags/esdt_local_role_flags.rs b/.../src/types/flags/esdt_local_role_flags.rs → .../src/types/flags/esdt_local_role_flags.rs
diff --git a/vm-core/src/types/flags/esdt_token_type.rs → ...n/core/src/types/flags/esdt_token_type.rs b/vm-core/src/types/flags/esdt_token_type.rs → ...n/core/src/types/flags/esdt_token_type.rs
diff --git a/vm-core/src/types/flags/return_code.rs → chain/core/src/types/flags/return_code.rs b/vm-core/src/types/flags/return_code.rs → chain/core/src/types/flags/return_code.rs
diff --git a/vm-core/src/types/flags/token_type.rs → chain/core/src/types/flags/token_type.rs b/vm-core/src/types/flags/token_type.rs → chain/core/src/types/flags/token_type.rs
diff --git a/vm-core/src/types/h256.rs → chain/core/src/types/h256.rs b/vm-core/src/types/h256.rs → chain/core/src/types/h256.rs
diff --git a/vm-core/src/types/heap_address.rs → chain/core/src/types/heap_address.rs b/vm-core/src/types/heap_address.rs → chain/core/src/types/heap_address.rs
diff --git a/vm-core/src/types/heap_h256.rs → chain/core/src/types/heap_h256.rs b/vm-core/src/types/heap_h256.rs → chain/core/src/types/heap_h256.rs
diff --git a/vm/Cargo.toml → chain/vm/Cargo.toml b/vm/Cargo.toml → chain/vm/Cargo.toml
@@ -36,7 +36,7 @@ ed25519-dalek = "2.1.0"
 
 [dependencies.multiversx-chain-core]
 version = "=0.10.0"
-path = "../vm-core"
+path = "../core"
 
 [dependencies.multiversx-chain-vm-executor]
 version = "0.2.0"
diff --git a/vm/README.md → chain/vm/README.md b/vm/README.md → chain/vm/README.md
diff --git a/vm/src/crypto_functions.rs → chain/vm/src/crypto_functions.rs b/vm/src/crypto_functions.rs → chain/vm/src/crypto_functions.rs
diff --git a/vm/src/display_util.rs → chain/vm/src/display_util.rs b/vm/src/display_util.rs → chain/vm/src/display_util.rs
diff --git a/vm/src/lib.rs → chain/vm/src/lib.rs b/vm/src/lib.rs → chain/vm/src/lib.rs
diff --git a/vm/src/mem_conv.rs → chain/vm/src/mem_conv.rs b/vm/src/mem_conv.rs → chain/vm/src/mem_conv.rs
diff --git a/vm/src/tx_execution.rs → chain/vm/src/tx_execution.rs b/vm/src/tx_execution.rs → chain/vm/src/tx_execution.rs
diff --git a/vm/src/tx_execution/blockchain_vm.rs → chain/vm/src/tx_execution/blockchain_vm.rs b/vm/src/tx_execution/blockchain_vm.rs → chain/vm/src/tx_execution/blockchain_vm.rs
diff --git a/...rc/tx_execution/builtin_function_mocks.rs → ...rc/tx_execution/builtin_function_mocks.rs b/...rc/tx_execution/builtin_function_mocks.rs → ...rc/tx_execution/builtin_function_mocks.rs
diff --git a/..._function_mocks/builtin_func_container.rs → ..._function_mocks/builtin_func_container.rs b/..._function_mocks/builtin_func_container.rs → ..._function_mocks/builtin_func_container.rs
diff --git a/...ltin_function_mocks/builtin_func_trait.rs → ...ltin_function_mocks/builtin_func_trait.rs b/...ltin_function_mocks/builtin_func_trait.rs → ...ltin_function_mocks/builtin_func_trait.rs
diff --git a/...unction_mocks/esdt_nft/esdt_local_burn.rs → ...unction_mocks/esdt_nft/esdt_local_burn.rs b/...unction_mocks/esdt_nft/esdt_local_burn.rs → ...unction_mocks/esdt_nft/esdt_local_burn.rs
diff --git a/...unction_mocks/esdt_nft/esdt_local_mint.rs → ...unction_mocks/esdt_nft/esdt_local_mint.rs b/...unction_mocks/esdt_nft/esdt_local_mint.rs → ...unction_mocks/esdt_nft/esdt_local_mint.rs
diff --git a/...ks/esdt_nft/esdt_nft_add_quantity_mock.rs → ...ks/esdt_nft/esdt_nft_add_quantity_mock.rs b/...ks/esdt_nft/esdt_nft_add_quantity_mock.rs → ...ks/esdt_nft/esdt_nft_add_quantity_mock.rs
diff --git a/...n_mocks/esdt_nft/esdt_nft_add_uri_mock.rs → ...n_mocks/esdt_nft/esdt_nft_add_uri_mock.rs b/...n_mocks/esdt_nft/esdt_nft_add_uri_mock.rs → ...n_mocks/esdt_nft/esdt_nft_add_uri_mock.rs
diff --git a/...tion_mocks/esdt_nft/esdt_nft_burn_mock.rs → ...tion_mocks/esdt_nft/esdt_nft_burn_mock.rs b/...tion_mocks/esdt_nft/esdt_nft_burn_mock.rs → ...tion_mocks/esdt_nft/esdt_nft_burn_mock.rs
diff --git a/...on_mocks/esdt_nft/esdt_nft_create_mock.rs → ...on_mocks/esdt_nft/esdt_nft_create_mock.rs b/...on_mocks/esdt_nft/esdt_nft_create_mock.rs → ...on_mocks/esdt_nft/esdt_nft_create_mock.rs
diff --git a/...sdt_nft/esdt_nft_update_attriutes_mock.rs → ...sdt_nft/esdt_nft_update_attriutes_mock.rs b/...sdt_nft/esdt_nft_update_attriutes_mock.rs → ...sdt_nft/esdt_nft_update_attriutes_mock.rs
diff --git a/...on/builtin_function_mocks/esdt_nft/mod.rs → ...on/builtin_function_mocks/esdt_nft/mod.rs b/...on/builtin_function_mocks/esdt_nft/mod.rs → ...on/builtin_function_mocks/esdt_nft/mod.rs
diff --git a/...ecution/builtin_function_mocks/general.rs → ...ecution/builtin_function_mocks/general.rs b/...ecution/builtin_function_mocks/general.rs → ...ecution/builtin_function_mocks/general.rs
diff --git a/...nction_mocks/general/change_owner_mock.rs → ...nction_mocks/general/change_owner_mock.rs b/...nction_mocks/general/change_owner_mock.rs → ...nction_mocks/general/change_owner_mock.rs
diff --git a/...s/general/claim_developer_rewards_mock.rs → ...s/general/claim_developer_rewards_mock.rs b/...s/general/claim_developer_rewards_mock.rs → ...s/general/claim_developer_rewards_mock.rs
diff --git a/...ion_mocks/general/delete_username_mock.rs → ...ion_mocks/general/delete_username_mock.rs b/...ion_mocks/general/delete_username_mock.rs → ...ion_mocks/general/delete_username_mock.rs
diff --git a/...on_mocks/general/migrate_username_mock.rs → ...on_mocks/general/migrate_username_mock.rs b/...on_mocks/general/migrate_username_mock.rs → ...on_mocks/general/migrate_username_mock.rs
diff --git a/...nction_mocks/general/set_username_mock.rs → ...nction_mocks/general/set_username_mock.rs b/...nction_mocks/general/set_username_mock.rs → ...nction_mocks/general/set_username_mock.rs
diff --git a/...unction_mocks/general/upgrade_contract.rs → ...unction_mocks/general/upgrade_contract.rs b/...unction_mocks/general/upgrade_contract.rs → ...unction_mocks/general/upgrade_contract.rs
diff --git a/...ocks/transfer/esdt_multi_transfer_mock.rs → ...ocks/transfer/esdt_multi_transfer_mock.rs b/...ocks/transfer/esdt_multi_transfer_mock.rs → ...ocks/transfer/esdt_multi_transfer_mock.rs
diff --git a/..._mocks/transfer/esdt_nft_transfer_mock.rs → ..._mocks/transfer/esdt_nft_transfer_mock.rs b/..._mocks/transfer/esdt_nft_transfer_mock.rs → ..._mocks/transfer/esdt_nft_transfer_mock.rs
diff --git a/...tion_mocks/transfer/esdt_transfer_mock.rs → ...tion_mocks/transfer/esdt_transfer_mock.rs b/...tion_mocks/transfer/esdt_transfer_mock.rs → ...tion_mocks/transfer/esdt_transfer_mock.rs
diff --git a/...on/builtin_function_mocks/transfer/mod.rs → ...on/builtin_function_mocks/transfer/mod.rs b/...on/builtin_function_mocks/transfer/mod.rs → ...on/builtin_function_mocks/transfer/mod.rs
diff --git a/...unction_mocks/transfer/transfer_common.rs → ...unction_mocks/transfer/transfer_common.rs b/...unction_mocks/transfer/transfer_common.rs → ...unction_mocks/transfer/transfer_common.rs
diff --git a/vm/src/tx_execution/exec_call.rs → chain/vm/src/tx_execution/exec_call.rs b/vm/src/tx_execution/exec_call.rs → chain/vm/src/tx_execution/exec_call.rs
diff --git a/...rc/tx_execution/exec_contract_endpoint.rs → ...rc/tx_execution/exec_contract_endpoint.rs b/...rc/tx_execution/exec_contract_endpoint.rs → ...rc/tx_execution/exec_contract_endpoint.rs
diff --git a/vm/src/tx_execution/exec_create.rs → chain/vm/src/tx_execution/exec_create.rs b/vm/src/tx_execution/exec_create.rs → chain/vm/src/tx_execution/exec_create.rs
diff --git a/vm/src/tx_execution/exec_general_tx.rs → chain/vm/src/tx_execution/exec_general_tx.rs b/vm/src/tx_execution/exec_general_tx.rs → chain/vm/src/tx_execution/exec_general_tx.rs
diff --git a/vm/src/tx_execution/system_sc.rs → chain/vm/src/tx_execution/system_sc.rs b/vm/src/tx_execution/system_sc.rs → chain/vm/src/tx_execution/system_sc.rs
diff --git a/...tx_execution/system_sc/system_sc_issue.rs → ...tx_execution/system_sc/system_sc_issue.rs b/...tx_execution/system_sc/system_sc_issue.rs → ...tx_execution/system_sc/system_sc_issue.rs
diff --git a/...tion/system_sc/system_sc_special_roles.rs → ...tion/system_sc/system_sc_special_roles.rs b/...tion/system_sc/system_sc_special_roles.rs → ...tion/system_sc/system_sc_special_roles.rs
diff --git a/...tion/system_sc/system_sc_unimplemented.rs → ...tion/system_sc/system_sc_unimplemented.rs b/...tion/system_sc/system_sc_unimplemented.rs → ...tion/system_sc/system_sc_unimplemented.rs
diff --git a/vm/src/tx_mock.rs → chain/vm/src/tx_mock.rs b/vm/src/tx_mock.rs → chain/vm/src/tx_mock.rs
diff --git a/vm/src/tx_mock/blockchain_rng.rs → chain/vm/src/tx_mock/blockchain_rng.rs b/vm/src/tx_mock/blockchain_rng.rs → chain/vm/src/tx_mock/blockchain_rng.rs
diff --git a/vm/src/tx_mock/blockchain_rng_unsupported.rs → ...src/tx_mock/blockchain_rng_unsupported.rs b/vm/src/tx_mock/blockchain_rng_unsupported.rs → ...src/tx_mock/blockchain_rng_unsupported.rs
diff --git a/vm/src/tx_mock/blockchain_update.rs → chain/vm/src/tx_mock/blockchain_update.rs b/vm/src/tx_mock/blockchain_update.rs → chain/vm/src/tx_mock/blockchain_update.rs
diff --git a/vm/src/tx_mock/tx_async_call_data.rs → chain/vm/src/tx_mock/tx_async_call_data.rs b/vm/src/tx_mock/tx_async_call_data.rs → chain/vm/src/tx_mock/tx_async_call_data.rs
diff --git a/vm/src/tx_mock/tx_async_promise.rs → chain/vm/src/tx_mock/tx_async_promise.rs b/vm/src/tx_mock/tx_async_promise.rs → chain/vm/src/tx_mock/tx_async_promise.rs
diff --git a/vm/src/tx_mock/tx_back_transfers.rs → chain/vm/src/tx_mock/tx_back_transfers.rs b/vm/src/tx_mock/tx_back_transfers.rs → chain/vm/src/tx_mock/tx_back_transfers.rs
diff --git a/vm/src/tx_mock/tx_cache.rs → chain/vm/src/tx_mock/tx_cache.rs b/vm/src/tx_mock/tx_cache.rs → chain/vm/src/tx_mock/tx_cache.rs
diff --git a/vm/src/tx_mock/tx_cache_balance_util.rs → ...n/vm/src/tx_mock/tx_cache_balance_util.rs b/vm/src/tx_mock/tx_cache_balance_util.rs → ...n/vm/src/tx_mock/tx_cache_balance_util.rs
diff --git a/vm/src/tx_mock/tx_cache_source.rs → chain/vm/src/tx_mock/tx_cache_source.rs b/vm/src/tx_mock/tx_cache_source.rs → chain/vm/src/tx_mock/tx_cache_source.rs
diff --git a/vm/src/tx_mock/tx_context.rs → chain/vm/src/tx_mock/tx_context.rs b/vm/src/tx_mock/tx_context.rs → chain/vm/src/tx_mock/tx_context.rs
diff --git a/vm/src/tx_mock/tx_context_ref.rs → chain/vm/src/tx_mock/tx_context_ref.rs b/vm/src/tx_mock/tx_context_ref.rs → chain/vm/src/tx_mock/tx_context_ref.rs
diff --git a/vm/src/tx_mock/tx_context_stack.rs → chain/vm/src/tx_mock/tx_context_stack.rs b/vm/src/tx_mock/tx_context_stack.rs → chain/vm/src/tx_mock/tx_context_stack.rs
diff --git a/vm/src/tx_mock/tx_input.rs → chain/vm/src/tx_mock/tx_input.rs b/vm/src/tx_mock/tx_input.rs → chain/vm/src/tx_mock/tx_input.rs
diff --git a/vm/src/tx_mock/tx_input_call_type.rs → chain/vm/src/tx_mock/tx_input_call_type.rs b/vm/src/tx_mock/tx_input_call_type.rs → chain/vm/src/tx_mock/tx_input_call_type.rs
diff --git a/vm/src/tx_mock/tx_input_function.rs → chain/vm/src/tx_mock/tx_input_function.rs b/vm/src/tx_mock/tx_input_function.rs → chain/vm/src/tx_mock/tx_input_function.rs
diff --git a/vm/src/tx_mock/tx_log.rs → chain/vm/src/tx_mock/tx_log.rs b/vm/src/tx_mock/tx_log.rs → chain/vm/src/tx_mock/tx_log.rs
diff --git a/vm/src/tx_mock/tx_managed_types.rs → chain/vm/src/tx_mock/tx_managed_types.rs b/vm/src/tx_mock/tx_managed_types.rs → chain/vm/src/tx_mock/tx_managed_types.rs
diff --git a/...rc/tx_mock/tx_managed_types/handle_map.rs → ...rc/tx_mock/tx_managed_types/handle_map.rs b/...rc/tx_mock/tx_managed_types/handle_map.rs → ...rc/tx_mock/tx_managed_types/handle_map.rs
diff --git a/.../tx_mock/tx_managed_types/tx_big_float.rs → .../tx_mock/tx_managed_types/tx_big_float.rs b/.../tx_mock/tx_managed_types/tx_big_float.rs → .../tx_mock/tx_managed_types/tx_big_float.rs
diff --git a/...rc/tx_mock/tx_managed_types/tx_big_int.rs → ...rc/tx_mock/tx_managed_types/tx_big_int.rs b/...rc/tx_mock/tx_managed_types/tx_big_int.rs → ...rc/tx_mock/tx_managed_types/tx_big_int.rs
diff --git a/...ock/tx_managed_types/tx_managed_buffer.rs → ...ock/tx_managed_types/tx_managed_buffer.rs b/...ock/tx_managed_types/tx_managed_buffer.rs → ...ock/tx_managed_types/tx_managed_buffer.rs
diff --git a/...x_mock/tx_managed_types/tx_managed_map.rs → ...x_mock/tx_managed_types/tx_managed_map.rs b/...x_mock/tx_managed_types/tx_managed_map.rs → ...x_mock/tx_managed_types/tx_managed_map.rs
diff --git a/vm/src/tx_mock/tx_panic.rs → chain/vm/src/tx_mock/tx_panic.rs b/vm/src/tx_mock/tx_panic.rs → chain/vm/src/tx_mock/tx_panic.rs
diff --git a/vm/src/tx_mock/tx_result.rs → chain/vm/src/tx_mock/tx_result.rs b/vm/src/tx_mock/tx_result.rs → chain/vm/src/tx_mock/tx_result.rs
diff --git a/vm/src/tx_mock/tx_result_calls.rs → chain/vm/src/tx_mock/tx_result_calls.rs b/vm/src/tx_mock/tx_result_calls.rs → chain/vm/src/tx_mock/tx_result_calls.rs
diff --git a/vm/src/types.rs → chain/vm/src/types.rs b/vm/src/types.rs → chain/vm/src/types.rs
diff --git a/vm/src/vm_err_msg.rs → chain/vm/src/vm_err_msg.rs b/vm/src/vm_err_msg.rs → chain/vm/src/vm_err_msg.rs
diff --git a/vm/src/vm_hooks.rs → chain/vm/src/vm_hooks.rs b/vm/src/vm_hooks.rs → chain/vm/src/vm_hooks.rs
diff --git a/vm/src/vm_hooks/vh_dispatcher.rs → chain/vm/src/vm_hooks/vh_dispatcher.rs b/vm/src/vm_hooks/vh_dispatcher.rs → chain/vm/src/vm_hooks/vh_dispatcher.rs
diff --git a/vm/src/vm_hooks/vh_handler.rs → chain/vm/src/vm_hooks/vh_handler.rs b/vm/src/vm_hooks/vh_handler.rs → chain/vm/src/vm_hooks/vh_handler.rs
diff --git a/vm/src/vm_hooks/vh_handler/vh_blockchain.rs → .../src/vm_hooks/vh_handler/vh_blockchain.rs b/vm/src/vm_hooks/vh_handler/vh_blockchain.rs → .../src/vm_hooks/vh_handler/vh_blockchain.rs
diff --git a/vm/src/vm_hooks/vh_handler/vh_call_value.rs → .../src/vm_hooks/vh_handler/vh_call_value.rs b/vm/src/vm_hooks/vh_handler/vh_call_value.rs → .../src/vm_hooks/vh_handler/vh_call_value.rs
diff --git a/vm/src/vm_hooks/vh_handler/vh_crypto.rs → ...n/vm/src/vm_hooks/vh_handler/vh_crypto.rs b/vm/src/vm_hooks/vh_handler/vh_crypto.rs → ...n/vm/src/vm_hooks/vh_handler/vh_crypto.rs
diff --git a/...rc/vm_hooks/vh_handler/vh_endpoint_arg.rs → ...rc/vm_hooks/vh_handler/vh_endpoint_arg.rs b/...rc/vm_hooks/vh_handler/vh_endpoint_arg.rs → ...rc/vm_hooks/vh_handler/vh_endpoint_arg.rs
diff --git a/...vm_hooks/vh_handler/vh_endpoint_finish.rs → ...vm_hooks/vh_handler/vh_endpoint_finish.rs b/...vm_hooks/vh_handler/vh_endpoint_finish.rs → ...vm_hooks/vh_handler/vh_endpoint_finish.rs
diff --git a/vm/src/vm_hooks/vh_handler/vh_error.rs → chain/vm/src/vm_hooks/vh_handler/vh_error.rs b/vm/src/vm_hooks/vh_handler/vh_error.rs → chain/vm/src/vm_hooks/vh_handler/vh_error.rs
diff --git a/vm/src/vm_hooks/vh_handler/vh_log.rs → chain/vm/src/vm_hooks/vh_handler/vh_log.rs b/vm/src/vm_hooks/vh_handler/vh_log.rs → chain/vm/src/vm_hooks/vh_handler/vh_log.rs
diff --git a/...c/vm_hooks/vh_handler/vh_managed_types.rs → ...c/vm_hooks/vh_handler/vh_managed_types.rs b/...c/vm_hooks/vh_handler/vh_managed_types.rs → ...c/vm_hooks/vh_handler/vh_managed_types.rs
diff --git a/..._handler/vh_managed_types/vh_big_float.rs → ..._handler/vh_managed_types/vh_big_float.rs b/..._handler/vh_managed_types/vh_big_float.rs → ..._handler/vh_managed_types/vh_big_float.rs
diff --git a/...vh_handler/vh_managed_types/vh_big_int.rs → ...vh_handler/vh_managed_types/vh_big_int.rs b/...vh_handler/vh_managed_types/vh_big_int.rs → ...vh_handler/vh_managed_types/vh_big_int.rs
diff --git a/...ler/vh_managed_types/vh_managed_buffer.rs → ...ler/vh_managed_types/vh_managed_buffer.rs b/...ler/vh_managed_types/vh_managed_buffer.rs → ...ler/vh_managed_types/vh_managed_buffer.rs
diff --git a/...andler/vh_managed_types/vh_managed_map.rs → ...andler/vh_managed_types/vh_managed_map.rs b/...andler/vh_managed_types/vh_managed_map.rs → ...andler/vh_managed_types/vh_managed_map.rs
diff --git a/vm/src/vm_hooks/vh_handler/vh_send.rs → chain/vm/src/vm_hooks/vh_handler/vh_send.rs b/vm/src/vm_hooks/vh_handler/vh_send.rs → chain/vm/src/vm_hooks/vh_handler/vh_send.rs
diff --git a/vm/src/vm_hooks/vh_handler/vh_storage.rs → .../vm/src/vm_hooks/vh_handler/vh_storage.rs b/vm/src/vm_hooks/vh_handler/vh_storage.rs → .../vm/src/vm_hooks/vh_handler/vh_storage.rs
diff --git a/vm/src/vm_hooks/vh_impl.rs → chain/vm/src/vm_hooks/vh_impl.rs b/vm/src/vm_hooks/vh_impl.rs → chain/vm/src/vm_hooks/vh_impl.rs
diff --git a/vm/src/vm_hooks/vh_impl/vh_debug_api.rs → ...n/vm/src/vm_hooks/vh_impl/vh_debug_api.rs b/vm/src/vm_hooks/vh_impl/vh_debug_api.rs → ...n/vm/src/vm_hooks/vh_impl/vh_debug_api.rs
diff --git a/vm/src/vm_hooks/vh_impl/vh_single_tx_api.rs → .../src/vm_hooks/vh_impl/vh_single_tx_api.rs b/vm/src/vm_hooks/vh_impl/vh_single_tx_api.rs → .../src/vm_hooks/vh_impl/vh_single_tx_api.rs
diff --git a/vm/src/vm_hooks/vh_impl/vh_static_api.rs → .../vm/src/vm_hooks/vh_impl/vh_static_api.rs b/vm/src/vm_hooks/vh_impl/vh_static_api.rs → .../vm/src/vm_hooks/vh_impl/vh_static_api.rs
diff --git a/vm/src/vm_hooks/vh_source.rs → chain/vm/src/vm_hooks/vh_source.rs b/vm/src/vm_hooks/vh_source.rs → chain/vm/src/vm_hooks/vh_source.rs
diff --git a/vm/src/with_shared.rs → chain/vm/src/with_shared.rs b/vm/src/with_shared.rs → chain/vm/src/with_shared.rs
diff --git a/vm/src/with_shared/shareable.rs → chain/vm/src/with_shared/shareable.rs b/vm/src/with_shared/shareable.rs → chain/vm/src/with_shared/shareable.rs
diff --git a/vm/src/with_shared/with_shared_mut_ref.rs → ...vm/src/with_shared/with_shared_mut_ref.rs b/vm/src/with_shared/with_shared_mut_ref.rs → ...vm/src/with_shared/with_shared_mut_ref.rs
diff --git a/vm/src/world_mock.rs → chain/vm/src/world_mock.rs b/vm/src/world_mock.rs → chain/vm/src/world_mock.rs
diff --git a/vm/src/world_mock/account_data.rs → chain/vm/src/world_mock/account_data.rs b/vm/src/world_mock/account_data.rs → chain/vm/src/world_mock/account_data.rs
diff --git a/vm/src/world_mock/block_info.rs → chain/vm/src/world_mock/block_info.rs b/vm/src/world_mock/block_info.rs → chain/vm/src/world_mock/block_info.rs
diff --git a/vm/src/world_mock/blockchain_mock.rs → chain/vm/src/world_mock/blockchain_mock.rs b/vm/src/world_mock/blockchain_mock.rs → chain/vm/src/world_mock/blockchain_mock.rs
diff --git a/...orld_mock/blockchain_mock_account_util.rs → ...orld_mock/blockchain_mock_account_util.rs b/...orld_mock/blockchain_mock_account_util.rs → ...orld_mock/blockchain_mock_account_util.rs
diff --git a/vm/src/world_mock/blockchain_state.rs → chain/vm/src/world_mock/blockchain_state.rs b/vm/src/world_mock/blockchain_state.rs → chain/vm/src/world_mock/blockchain_state.rs
diff --git a/vm/src/world_mock/esdt_data.rs → chain/vm/src/world_mock/esdt_data.rs b/vm/src/world_mock/esdt_data.rs → chain/vm/src/world_mock/esdt_data.rs
diff --git a/vm/src/world_mock/esdt_instance.rs → chain/vm/src/world_mock/esdt_instance.rs b/vm/src/world_mock/esdt_instance.rs → chain/vm/src/world_mock/esdt_instance.rs
diff --git a/vm/src/world_mock/esdt_instance_metadata.rs → .../src/world_mock/esdt_instance_metadata.rs b/vm/src/world_mock/esdt_instance_metadata.rs → .../src/world_mock/esdt_instance_metadata.rs
diff --git a/vm/src/world_mock/esdt_instances.rs → chain/vm/src/world_mock/esdt_instances.rs b/vm/src/world_mock/esdt_instances.rs → chain/vm/src/world_mock/esdt_instances.rs
diff --git a/vm/src/world_mock/esdt_roles.rs → chain/vm/src/world_mock/esdt_roles.rs b/vm/src/world_mock/esdt_roles.rs → chain/vm/src/world_mock/esdt_roles.rs
diff --git a/vm/src/world_mock/failing_executor.rs → chain/vm/src/world_mock/failing_executor.rs b/vm/src/world_mock/failing_executor.rs → chain/vm/src/world_mock/failing_executor.rs
diff --git a/vm/src/world_mock/reserved.rs → chain/vm/src/world_mock/reserved.rs b/vm/src/world_mock/reserved.rs → chain/vm/src/world_mock/reserved.rs
diff --git a/vm/tests/test_crypto.rs → chain/vm/tests/test_crypto.rs b/vm/tests/test_crypto.rs → chain/vm/tests/test_crypto.rs
diff --git a/contracts/examples/adder/interact/Cargo.toml b/contracts/examples/adder/interact/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "basic-interact"
 version = "0.0.0"
-authors = ["Ovidiu Stinga <ovidiu.stinga@multiversx.com>"]
+authors = ["MultiversX <contact@multiversx.com>"]
 edition = "2021"
 publish = false
 

diff --git a/contracts/examples/ping-pong-egld/interactor/Cargo.toml b/contracts/examples/ping-pong-egld/interactor/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "ping-pong-egld-interact"
 version = "0.0.0"
-authors = ["Ovidiu Stinga <ovidiu.stinga@multiversx.com>"]
+authors = ["MultiversX <contact@multiversx.com>"]
 edition = "2021"
 publish = false
 

diff --git a/contracts/feature-tests/basic-features/interact/Cargo.toml b/contracts/feature-tests/basic-features/interact/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "basic-features-interact"
 version = "0.0.0"
-authors = ["Ovidiu Stinga <ovidiu.stinga@multiversx.com>"]
+authors = ["MultiversX <contact@multiversx.com>"]
 edition = "2021"
 publish = false
 

diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml
@@ -40,4 +40,4 @@ features = ["derive"]
 
 [dependencies.multiversx-chain-core]
 version = "=0.10.0"
-path = "../../vm-core"
+path = "../../chain/core"
diff --git a/framework/scenario/Cargo.toml b/framework/scenario/Cargo.toml
@@ -54,4 +54,4 @@ version = "0.2.0"
 
 [dependencies.multiversx-chain-vm]
 version = "=0.10.0"
-path = "../../vm"
+path = "../../chain/vm"
diff --git a/sdk/core/Cargo.toml b/sdk/core/Cargo.toml
@@ -40,4 +40,4 @@ uuid = {version = "1.10.0", features = ["v4"]}
 
 [dependencies.multiversx-chain-core]
 version = "=0.10.0"
-path = "../../vm-core"
+path = "../../chain/core"
diff --git a/tools/rust-debugger/format-tests/Cargo.toml b/tools/rust-debugger/format-tests/Cargo.toml
@@ -18,7 +18,7 @@ path = "../../../framework/scenario"
 
 [dependencies.multiversx-chain-vm]
 version = "=0.10.0"
-path = "../../../vm"
+path = "../../../chain/vm"
 
 [dev-dependencies]
 glob = "0.3.0"

diff --git a/tools/rust-debugger/format-tests/tests/run_format_tests.rs b/tools/rust-debugger/format-tests/tests/run_format_tests.rs
@@ -2,7 +2,6 @@
 use std::{io::BufRead, path::Path, process::Command};
 
 #[test]
-#[ignore = "TODO: fix LLDB integration"]
 fn run_format_tests() {
     let home_dir = home::home_dir().unwrap();