diff --git a/src/page.h b/src/page.h index 42f1d7f..76c672a 100644 --- a/src/page.h +++ b/src/page.h @@ -4347,6 +4347,8 @@ private: { transaction tx; + //cout << "\n\n\n_tx_info.id_hash:" << _tx_info.id_hash << endl; + if (!xmreg::make_tx_from_json(_tx_info.tx_json, tx)) { cerr << "Cant make tx from _tx_info.tx_json" << endl; diff --git a/src/tools.cpp b/src/tools.cpp index 17dfcd9..cd5f775 100644 --- a/src/tools.cpp +++ b/src/tools.cpp @@ -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(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." <(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." <(); @@ -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& ecdhInfo = rct_signatures.ecdhInfo; for (json& ecdhI: j["rct_signatures"]["ecdhInfo"]) @@ -1248,7 +1266,7 @@ make_tx_from_json(const string& json_str, transaction& tx) } // j.find("rctsig_prunable") != j.end() - //cout << "\nreconstructed: \n" << j.dump(4) << endl; + //cout << "From reconstructed tx: " << obj_to_json_str(tx) << endl;