moneroexamples 7 years ago
parent 6625ae6c65
commit 1b6c8b2bbf

@ -3440,12 +3440,11 @@ public:
reinterpret_cast<const account_public_address*>( reinterpret_cast<const account_public_address*>(
decoded_raw_data.data()); decoded_raw_data.data());
address_parse_info address_info {*xmr_address, false}; address_parse_info address_info {*xmr_address, false, false, crypto::null_hash8};
context.insert({"address" , REMOVE_HASH_BRAKETS( context.insert({"address" , REMOVE_HASH_BRAKETS(
xmreg::print_address(address_info, nettype))}); xmreg::print_address(address_info, nettype))});
context.insert({"viewkey" , REMOVE_HASH_BRAKETS( context.insert({"viewkey" , pod_to_hex(prv_view_key)});
fmt::format("{:s}", prv_view_key))});
context.insert({"has_total_xmr" , false}); context.insert({"has_total_xmr" , false});
context.insert({"total_xmr" , string{}}); context.insert({"total_xmr" , string{}});
context.insert({"output_keys" , mstch::array{}}); context.insert({"output_keys" , mstch::array{}});
@ -3461,6 +3460,7 @@ public:
std::stringstream iss; std::stringstream iss;
iss << body; iss << body;
boost::archive::portable_binary_iarchive ar(iss); boost::archive::portable_binary_iarchive ar(iss);
//boost::archive::binary_iarchive ar(iss);
ar >> outputs; ar >> outputs;

@ -1075,7 +1075,7 @@ decrypt(const std::string &ciphertext,
} }
crypto::chacha8(ciphertext.data() + sizeof(iv), crypto::chacha20(ciphertext.data() + sizeof(iv),
ciphertext.size() - prefix_size, ciphertext.size() - prefix_size,
key, iv, &plaintext[0]); key, iv, &plaintext[0]);

Loading…
Cancel
Save