tiamak/Peya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

tweaked build of audit tool; added asset_type to destinations in RPC get_* calls

Browse Source
This commit is contained in:
Some Random Crypto Guy
2025-02-28 11:51:35 +00:00
parent 378ec75a6e
commit d5f6cdc0cd
2 changed files with 38 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
src/blockchain_utilities/CMakeLists.txt
View File

@@ -142,22 +142,20 @@ set(blockchain_scanner_private_headers)
monero_private_headers(blockchain_scanner monero_private_headers(blockchain_scanner
${blockchain_scanner_private_headers}) ${blockchain_scanner_private_headers})
if (BUILD_AUDIT) if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/blockchain_audit.cpp" AND NOT IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/blockchain_audit.cpp")
if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/blockchain_audit.cpp" AND NOT IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/blockchain_audit.cpp") set(blockchain_audit_sources
set(blockchain_audit_sources blockchain_audit.cpp
blockchain_audit.cpp threadpool_boost.cpp
threadpool_boost.cpp )
)
set(blockchain_audit_private_headers set(blockchain_audit_private_headers
threadpool_boost.h threadpool_boost.h
) )
monero_private_headers(blockchain_audit monero_private_headers(blockchain_audit
${blockchain_audit_private_headers}) ${blockchain_audit_private_headers})
else() else()
message(STATUS "blockchain_audit.cpp not found - not building the audit tool") message(STATUS "blockchain_audit.cpp not found - not building the audit tool")
endif()
endif() endif()
monero_add_executable(blockchain_import monero_add_executable(blockchain_import
@@ -329,35 +327,33 @@ set_property(TARGET blockchain_scanner
OUTPUT_NAME "salvium-blockchain-scanner") OUTPUT_NAME "salvium-blockchain-scanner")
install(TARGETS blockchain_scanner DESTINATION bin) install(TARGETS blockchain_scanner DESTINATION bin)
if (BUILD_AUDIT) if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/blockchain_audit.cpp" AND NOT IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/blockchain_audit.cpp")
if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/blockchain_audit.cpp" AND NOT IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/blockchain_audit.cpp") monero_add_executable(blockchain_audit
monero_add_executable(blockchain_audit ${blockchain_audit_sources}
${blockchain_audit_sources} ${blockchain_audit_private_headers})
${blockchain_audit_private_headers})
target_include_directories(blockchain_audit PRIVATE /usr/include/mysql-cppconn/jdbc) target_include_directories(blockchain_audit PRIVATE /usr/include/mysql-cppconn/jdbc)
target_link_libraries(blockchain_audit target_link_libraries(blockchain_audit
PRIVATE PRIVATE
wallet wallet
crypto crypto
cncrypto cncrypto
cryptonote_core cryptonote_core
blockchain_db blockchain_db
version version
epee epee
mysqlcppconn mysqlcppconn
${Boost_FILESYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY}
${Boost_SYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY}
${Boost_THREAD_LIBRARY} ${Boost_THREAD_LIBRARY}
${CMAKE_THREAD_LIBS_INIT} ${CMAKE_THREAD_LIBS_INIT}
${EXTRA_LIBRARIES}) ${EXTRA_LIBRARIES})
set_property(TARGET blockchain_audit set_property(TARGET blockchain_audit
PROPERTY PROPERTY
OUTPUT_NAME "salvium-blockchain-audit") OUTPUT_NAME "salvium-blockchain-audit")
install(TARGETS blockchain_audit DESTINATION bin) install(TARGETS blockchain_audit DESTINATION bin)
endif()
endif() endif()
monero_add_executable(blockchain_stats monero_add_executable(blockchain_stats

2
src/wallet/wallet_rpc_server.cpp
View File

@@ -390,6 +390,7 @@ namespace tools
wallet_rpc::transfer_destination &td = entry.destinations.back(); wallet_rpc::transfer_destination &td = entry.destinations.back();
td.amount = d.amount; td.amount = d.amount;
td.address = d.address(m_wallet->nettype(), pd.m_payment_id); td.address = d.address(m_wallet->nettype(), pd.m_payment_id);
td.asset_type = pd.m_tx.source_asset_type;
} }
entry.asset_type = pd.m_tx.source_asset_type; entry.asset_type = pd.m_tx.source_asset_type;
@@ -422,6 +423,7 @@ namespace tools
wallet_rpc::transfer_destination &td = entry.destinations.back(); wallet_rpc::transfer_destination &td = entry.destinations.back();
td.amount = d.amount; td.amount = d.amount;
td.address = d.address(m_wallet->nettype(), pd.m_payment_id); td.address = d.address(m_wallet->nettype(), pd.m_payment_id);
td.asset_type = pd.m_tx.source_asset_type;
} }
entry.type = is_failed ? "failed" : "pending"; entry.type = is_failed ? "failed" : "pending";