Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Merge branch 'bug/cli-wallet-memo-display' into 'develop'

Browse source 
Fix cli wallet memo displaying

See merge request PBSA/peerplays!52
This commit is contained in:
serkixenos 2022-01-17 18:25:33 +00:00
commit b5a9a0101a
1 changed files with 25 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
libraries/wallet/wallet.cpp
View file

@ -4184,27 +4184,33 @@ string operation_printer::operator()(const transfer_operation& op) const
std::string memo; std::string memo;
if( op.memo ) if( op.memo )
{ {
if( wallet.is_locked() ) bool is_encrypted = ((op.memo->from != public_key_type()) && (op.memo->to != public_key_type()));
{ if (is_encrypted) {
out << " -- Unlock wallet to see memo."; if( wallet.is_locked() )
} else { {
try { out << " -- Unlock wallet to see memo.";
FC_ASSERT(wallet._keys.count(op.memo->to) || wallet._keys.count(op.memo->from), "Memo is encrypted to a key ${to} or ${from} not in this wallet.", ("to", op.memo->to)("from",op.memo->from)); } else {
if( wallet._keys.count(op.memo->to) ) { try {
auto my_key = wif_to_key(wallet._keys.at(op.memo->to)); FC_ASSERT(wallet._keys.count(op.memo->to) || wallet._keys.count(op.memo->from), "Memo is encrypted to a key ${to} or ${from} not in this wallet.", ("to", op.memo->to)("from",op.memo->from));
FC_ASSERT(my_key, "Unable to recover private key to decrypt memo. Wallet may be corrupted."); if( wallet._keys.count(op.memo->to) ) {
memo = op.memo->get_message(*my_key, op.memo->from); auto my_key = wif_to_key(wallet._keys.at(op.memo->to));
out << " -- Memo: " << memo; FC_ASSERT(my_key, "Unable to recover private key to decrypt memo. Wallet may be corrupted.");
} else { memo = op.memo->get_message(*my_key, op.memo->from);
auto my_key = wif_to_key(wallet._keys.at(op.memo->from)); out << " -- Memo: " << memo;
FC_ASSERT(my_key, "Unable to recover private key to decrypt memo. Wallet may be corrupted."); } else {
memo = op.memo->get_message(*my_key, op.memo->to); auto my_key = wif_to_key(wallet._keys.at(op.memo->from));
out << " -- Memo: " << memo; FC_ASSERT(my_key, "Unable to recover private key to decrypt memo. Wallet may be corrupted.");
memo = op.memo->get_message(*my_key, op.memo->to);
out << " -- Memo: " << memo;
}
} catch (const fc::exception& e) {
out << " -- could not decrypt memo";
elog("Error when decrypting memo: ${e}", ("e", e.to_detail_string()));
} }
} catch (const fc::exception& e) {
out << " -- could not decrypt memo";
elog("Error when decrypting memo: ${e}", ("e", e.to_detail_string()));
} }
} else {
memo = op.memo->get_message(private_key_type(), public_key_type());
out << " -- Memo: " << memo;
} }
} }
fee(op.fee); fee(op.fee);