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

updated ringct function libraries; fixed build issue with blockchain_utilities

Browse Source
This commit is contained in:
Some Random Crypto Guy
2024-06-18 23:16:45 +01:00
parent 7bb90f57d4
commit f41c20ee7c
18 changed files with 205 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wallet/wallet2.cpp
+4 -4
View File
@@ -2323,10 +2323,10 @@ bool wallet2::get_pricing_record(oracle::pricing_record& pr, const uint64_t heig
bool wallet2::get_circulating_supply(std::vector<std::pair<std::string, std::string>> &amounts)
{
// Issue an RPC call to get the block header (and thus the pricing record) at the specified height
cryptonote::COMMAND_RPC_GET_CIRCULATING_SUPPLY::request req = AUTO_VAL_INIT(req);
cryptonote::COMMAND_RPC_GET_CIRCULATING_SUPPLY::response res = AUTO_VAL_INIT(res);
cryptonote::COMMAND_RPC_GET_SUPPLY_INFO::request req = AUTO_VAL_INIT(req);
cryptonote::COMMAND_RPC_GET_SUPPLY_INFO::response res = AUTO_VAL_INIT(res);
m_daemon_rpc_mutex.lock();
bool r = invoke_http_json_rpc("/json_rpc", "get_circulating_supply", req, res, rpc_timeout);
bool r = invoke_http_json_rpc("/json_rpc", "get_supply_info", req, res, rpc_timeout);
m_daemon_rpc_mutex.unlock();
if (r && res.status == CORE_RPC_STATUS_OK)
{
@@ -2338,7 +2338,7 @@ bool wallet2::get_circulating_supply(std::vector<std::pair<std::string, std::str
}
else
{
MERROR("Failed to retrieve circulating supply from daemon");
MERROR("Failed to retrieve supply info from daemon");
return false;
}
}
src/wallet/wallet_rpc_server.cpp
+1 -1
View File
@@ -473,7 +473,7 @@ namespace tools
balance_info.balance = req.all_accounts ? m_wallet->balance_all(req.strict, asset) : m_wallet->balance(req.account_index, asset, req.strict);
if (!balance_info.balance)
continue;
balance_info.unlocked_balance = req.all_accounts ? m_wallet->unlocked_balance_all(req.strict, asset, &balance_info.blocks_to_unlock, &balance_info.time_to_unlock) : m_wallet->unlocked_balance(req.account_index, "XHV", req.strict, &balance_info.blocks_to_unlock, &balance_info.time_to_unlock);
balance_info.unlocked_balance = req.all_accounts ? m_wallet->unlocked_balance_all(req.strict, asset, &balance_info.blocks_to_unlock, &balance_info.time_to_unlock) : m_wallet->unlocked_balance(req.account_index, asset, req.strict, &balance_info.blocks_to_unlock, &balance_info.time_to_unlock);
balance_info.multisig_import_needed = m_wallet->multisig() && m_wallet->has_multisig_partial_key_images();
std::map<uint32_t, std::map<uint32_t, uint64_t>> balance_per_subaddress_per_account;
std::map<uint32_t, std::map<uint32_t, std::pair<uint64_t, std::pair<uint64_t, uint64_t>>>> unlocked_balance_per_subaddress_per_account;