d0s3t3ch
/
onion-wownero-blockchain-explorer
mirror of https://git.wownero.com/wownero/onion-wownero-blockchain-explorer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: pseudoOuts missing in some ringct txs from mempool

This commit is contained in:
moneroexamples 2017-01-11 01:09:57 +00:00
parent 5c265af68c
commit cc97b932ad
2 changed files with 44 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/page.h
View File

@ -4347,10 +4347,7 @@ private:
{
transaction tx;
if (_tx_info.id_hash != "edb1e71c24a6a3c1ce101d68c7525d6422c09d8bfe4a8f74adeb04f118211072")
continue;
cout << "\n\n\n_tx_info.id_hash:" << _tx_info.id_hash << endl;
//cout << "\n\n\n_tx_info.id_hash:" << _tx_info.id_hash << endl;
if (!xmreg::make_tx_from_json(_tx_info.tx_json, tx))
{

68
src/tools.cpp
View File

@ -143,34 +143,34 @@ remove_trailing_path_separator(const bf::path& in_path)
return bf::path(remove_trailing_path_separator(path_str));
}
//string
//timestamp_to_str(time_t timestamp, const char* format)
//{
// auto a_time_point = chrono::system_clock::from_time_t(timestamp);
//
// try
// {
// auto utc = date::to_utc_time(chrono::system_clock::from_time_t(timestamp));
// auto sys_time = date::to_sys_time(utc);
//
// return date::format(format, date::floor<chrono::seconds>(sys_time));
// }
// catch (std::runtime_error& e)
// {
// cerr << "xmreg::timestamp_to_str: " << e.what() << endl;
// cerr << "Seems cant convert to UTC timezone using date library. "
// "So just use local timezone." <<endl;
//
// return timestamp_to_str_local(timestamp, format);
// }
//}
string
timestamp_to_str(time_t timestamp, const char* format)
{
return get_human_readable_timestamp(timestamp);
auto a_time_point = chrono::system_clock::from_time_t(timestamp);
try
{
auto utc = date::to_utc_time(chrono::system_clock::from_time_t(timestamp));
auto sys_time = date::to_sys_time(utc);
return date::format(format, date::floor<chrono::seconds>(sys_time));
}
catch (std::runtime_error& e)
{
cerr << "xmreg::timestamp_to_str: " << e.what() << endl;
cerr << "Seems cant convert to UTC timezone using date library. "
"So just use local timezone." <<endl;
return timestamp_to_str_local(timestamp, format);
}
}
//string
//timestamp_to_str(time_t timestamp, const char* format)
//{
// return get_human_readable_timestamp(timestamp);
//}
string
timestamp_to_str_local(time_t timestamp, const char* format)
{
@ -1023,7 +1023,7 @@ make_tx_from_json(const string& json_str, transaction& tx)
}
cout << "\n\n j.dump()" << j.dump(4) << endl;
// cout << "\n\n j.dump()" << j.dump(4) << endl;
// get version and unlock time from json
tx.version = j["version"].get<size_t>();
@ -1121,6 +1121,24 @@ make_tx_from_json(const string& json_str, transaction& tx)
{
rct::rctSig& rct_signatures = tx.rct_signatures;
if (j["rct_signatures"].find("pseudoOuts") != j["rct_signatures"].end())
{
rct::keyV& pseudoOuts = rct_signatures.pseudoOuts;
for (json& pOut: j["rct_signatures"]["pseudoOuts"])
{
rct::key pOut_key;
if (!epee::string_tools::hex_to_pod(pOut, pOut_key))
{
cerr << "Faild to parse pOut_key of pseudoOuts from json" << endl;
return false;
}
pseudoOuts.push_back(pOut_key);
}
}
vector<rct::ecdhTuple>& ecdhInfo = rct_signatures.ecdhInfo;
for (json& ecdhI: j["rct_signatures"]["ecdhInfo"])
@ -1250,7 +1268,7 @@ make_tx_from_json(const string& json_str, transaction& tx)
cout << "From reconstructed tx: " << obj_to_json_str(tx) << endl;
//cout << "From reconstructed tx: " << obj_to_json_str(tx) << endl;
return true;
}