From 5978ed27f22ab51fe2b7d0b83cab2a62e30b1cae Mon Sep 17 00:00:00 2001 From: cryptozoidberg Date: Wed, 9 Apr 2025 12:09:09 +0400 Subject: [PATCH] fixed issue with deploy asset --- src/wallet/wallet_public_structs_defs.h | 2 +- src/wallet/wallet_rpc_server.cpp | 3 +++ src/wallet/wallets_manager.h | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/wallet/wallet_public_structs_defs.h b/src/wallet/wallet_public_structs_defs.h index 9e5e352e..eb0a53d7 100644 --- a/src/wallet/wallet_public_structs_defs.h +++ b/src/wallet/wallet_public_structs_defs.h @@ -1935,7 +1935,7 @@ namespace wallet_public crypto::public_key new_asset_id; BEGIN_KV_SERIALIZE_MAP() - KV_SERIALIZE_POD_AS_HEX_STRING(tx_id) DOC_DSCR("Id of transaction that carries asset registration command, asset would be registered as soon as transaction got confirmed") DOC_EXMP("f74bb56a5b4fa562e679ccaadd697463498a66de4f1760b2cd40f11c3a00a7a8") DOC_END + KV_SERIALIZE_POD_AS_HEX_STRING(tx_id) DOC_DSCR("Id of transaction that carries asset registration command, asset would be registered as soon as transaction got confirmed") DOC_EXMP("f74bb56a5b4fa562e679ccaadd697463498a66de4f1760b2cd40f11c3a00a7a8") DOC_END KV_SERIALIZE_POD_AS_HEX_STRING(new_asset_id) DOC_DSCR("Issued asset id") DOC_EXMP("40fa6db923728b38962718c61b4dc3af1acaa1967479c73703e260dc3609c58d") DOC_END END_KV_SERIALIZE_MAP() }; diff --git a/src/wallet/wallet_rpc_server.cpp b/src/wallet/wallet_rpc_server.cpp index 6def4e7c..cdfda9c8 100644 --- a/src/wallet/wallet_rpc_server.cpp +++ b/src/wallet/wallet_rpc_server.cpp @@ -268,6 +268,8 @@ namespace tools //------------------------------------------------------------------------------------------------------------------------------ bool wallet_rpc_server::handle_http_request(const epee::net_utils::http::http_request_info& query_info, epee::net_utils::http::http_response_info& response, epee::net_utils::connection_context_base& conn_context, bool& call_found, documentation& docs) { + + //#ifndef _DEBUG if (m_jwt_secret.size() && conn_context.m_connection_id != RPC_INTERNAL_UI_CONTEXT) { if (!auth_http_request(query_info, response, conn_context)) @@ -278,6 +280,7 @@ namespace tools return true; } } + #endif response.m_response_code = 200; response.m_response_comment = "Ok"; diff --git a/src/wallet/wallets_manager.h b/src/wallet/wallets_manager.h index 1a804726..77e2cbc7 100644 --- a/src/wallet/wallets_manager.h +++ b/src/wallet/wallets_manager.h @@ -237,7 +237,7 @@ private: std::mutex m_stop_singal_sent_mutex; std::condition_variable m_stop_singal_sent_mutex_cv; - std::mutex m_select_wallet_rpc_lock; + std::recursive_mutex m_select_wallet_rpc_lock; view::i_view m_view_stub; view::i_view* m_pview;