nerodev
/
onion-wownero-explorer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove make_tx_from_json

Browse Source
master
moneroexamples 7 years ago
parent ad31f1850a
commit 93c3013366
2 changed files with 911 additions and 1185 deletions
Show Stats Download Patch File Download Diff File

1
src/MempoolStatus.cpp
Unescape Escape View File

@ -137,7 +137,6 @@ MempoolStatus::read_mempool()
return false;
}
mempool_size_kB += _tx_info.blob_size;
local_copy_of_mempool_txs.push_back(mempool_tx {tx_hash, tx});

273
src/tools.cpp
Unescape Escape View File

@ -1189,278 +1189,6 @@ namespace xmreg
}
bool
make_tx_from_json(const string& json_str, transaction& tx)
{
json j;
try
{
j = json::parse(json_str);
}
catch (std::invalid_argument& e)
{
cerr << "make_tx_from_json: cant parse json string: " << e.what() << endl;
return false;
}
cout << "\n\n j.dump()" << j.dump(4) << '\n';
// get version and unlock time from json
tx.version = j["version"].get<size_t>();
tx.unlock_time = j["unlock_time"].get<uint64_t>();
// next get extra data
for (json& extra_val: j["extra"])
tx.extra.push_back(extra_val.get<uint8_t>());
// now populate output data from json
vector<tx_out>& tx_outputs = tx.vout;
for (json& vo: j["vout"])
{
uint64_t amount = vo["amount"].get<uint64_t>();
public_key out_pub_key;
if (!epee::string_tools::hex_to_pod(vo["target"]["key"], out_pub_key))
{
cerr << "Faild to parse public_key of an output from json" << endl;
return false;
}
txout_target_v target {txout_to_key {out_pub_key}};
tx_outputs.push_back(tx_out {amount, target});
}
// now populate input data from json
vector<txin_v>& tx_inputs = tx.vin;
for (json& vi: j["vin"])
{
uint64_t amount = vi["key"]["amount"].get<uint64_t>();
key_image in_key_image;
if (!epee::string_tools::hex_to_pod(vi["key"]["k_image"], in_key_image))
{
cerr << "Faild to parse key_image of an input from json" << endl;
return false;
}
vector<uint64_t> key_offsets;
for (json& ko: vi["key"]["key_offsets"])
{
key_offsets.push_back(ko.get<uint64_t>());
}
txin_v _txin_v {txin_to_key {amount, key_offsets, in_key_image}};
tx_inputs.push_back(_txin_v);
}
// add ring signatures field
if (j.find("signatures") != j.end())
{
vector<vector<signature>>& signatures = tx.signatures;
for (json& sigs: j["signatures"])
{
string concatanted_sig = sigs;
vector<signature> sig_split;
auto split_sig = [&](string::iterator &b, string::iterator &e)
{
signature a_sig;
if (!epee::string_tools::hex_to_pod(string(b, e), a_sig))
{
cerr << "Faild to parse signature from json" << endl;
return false;
}
sig_split.push_back(a_sig);
return true;
};
chunks(concatanted_sig.begin(), concatanted_sig.end(), 128, split_sig);
signatures.push_back(sig_split);
}
}
// now add rct_signatures from json to tx if exist
if (j.find("rct_signatures") != j.end())
{
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"])
{
rct::ecdhTuple a_tuple;
//cout << "ecdhI[\"amount\"]: " << ecdhI["amount"] << endl;
if (!epee::string_tools::hex_to_pod(ecdhI["amount"], a_tuple.amount))
{
cerr << "Faild to parse ecdhInfo of an amount from json" << endl;
return false;
}
//cout << epee::string_tools::pod_to_hex(a_tuple.amount) << endl;
if (!epee::string_tools::hex_to_pod(ecdhI["mask"], a_tuple.mask))
{
cerr << "Faild to parse ecdhInfo of an mask from json" << endl;
return false;
}
ecdhInfo.push_back(a_tuple);
}
vector<rct::ctkey>& outPk = rct_signatures.outPk;
for (json& pk: j["rct_signatures"]["outPk"])
{
outPk.push_back(rct::ctkey {rct::zero(), rct::zero()});
rct::key& mask = outPk.back().mask;
if (!epee::string_tools::hex_to_pod(pk, mask))
{
cerr << "Faild to parse rct::key of an outPk from json" << endl;
return false;
}
// cout << "dest: " << epee::string_tools::pod_to_hex(outPk.back().mask) << endl;
}
rct_signatures.txnFee = j["rct_signatures"]["txnFee"].get<uint64_t>();
rct_signatures.type = j["rct_signatures"]["type"].get<uint8_t>();
} // if (j.find("rct_signatures") != j.end())
if (j.find("rctsig_prunable") != j.end())
{
rct::rctSigPrunable& rctsig_prunable = tx.rct_signatures.p;
vector<rct::rangeSig>& range_sigs = rctsig_prunable.rangeSigs;
for (json& range_s: j["rctsig_prunable"]["rangeSigs"])
{
rct::boroSig asig;
if (!epee::string_tools::hex_to_pod(range_s["asig"], asig))
{
cerr << "Faild to parse asig of an asnlSig from json" << endl;
return false;
}
struct {
rct::key64 Ci;
} key64_contained;
if (!epee::string_tools::hex_to_pod(range_s["Ci"], key64_contained))
{
cerr << "Faild to parse Ci of an asnlSig from json" << endl;
return false;
}
range_sigs.push_back(rct::rangeSig {});
rct::rangeSig& last_range_sig = range_sigs.back();
last_range_sig.asig = asig;
memcpy(&(last_range_sig.Ci), &(key64_contained.Ci), sizeof(rct::key64));
} // for (json& range_s: j["rctsig_prunable"]["rangeSigs"])
vector<rct::mgSig>& mg_sigs = rctsig_prunable.MGs;
for (json& a_mgs: j["rctsig_prunable"]["MGs"])
{
rct::mgSig new_mg_sig;
vector<rct::keyV>& ss = new_mg_sig.ss;
for (json& ss_j: a_mgs["ss"])
{
rct::key a_key1;
if (!epee::string_tools::hex_to_pod(ss_j[0], a_key1))
{
cerr << "Faild to parse ss a_key1 of an MGs from json" << endl;
return false;
}
rct::key a_key2;
if (!epee::string_tools::hex_to_pod(ss_j[1], a_key2))
{
cerr << "Faild to parse ss a_key2 of an MGs from json" << endl;
return false;
}
ss.push_back(vector<rct::key>{a_key1, a_key2});
}
json& cc_j = a_mgs["cc"];
if (!epee::string_tools::hex_to_pod(cc_j, new_mg_sig.cc))
{
cerr << "Faild to parse cc an MGs from json" << endl;
return false;
}
mg_sigs.push_back(new_mg_sig);
} // for (json& a_mgs: j["rctsig_prunable"]["MGs"])
//std::vector<Bulletproof>& bulletproof = rctsig_prunable.bulletproofs;
} // j.find("rctsig_prunable") != j.end()
//cout << "From reconstructed tx: " << obj_to_json_str(tx) << endl;
return true;
}
string
make_printable(const string& in_s)
{
@ -1499,7 +1227,6 @@ namespace xmreg
}
string
get_human_readable_timestamp(uint64_t ts)
{

Write Preview
Loading…
Cancel
Save