Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity

validate_escrow_proposal now requires service attachment body to be encrypted

Browse source
This commit is contained in:
sowle 2023-05-02 20:32:11 +02:00
parent 9efa8f7a6f
commit f094aeb0b1
No known key found for this signature in database
GPG key ID: C07A24B2D89D49FC
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/wallet/wallet2_escrow.cpp
View file

@ -58,8 +58,12 @@ bool wallet2::validate_escrow_proposal(const wallet_public::wallet_transfer_info
bool r = decrypt_payload_items(wti.is_income, prop.tx_template, m_account.get_keys(), decrypted_items);
LOC_CHK(r, "failed to decrypt payload items in proposal tx");
r = bc_services::get_service_attachment_json_by_id(decrypted_items, BC_ESCROW_SERVICE_ID, BC_ESCROW_SERVICE_INSTRUCTION_PRIVATE_DETAILS, cpd);
currency::tx_service_attachment tsa = AUTO_VAL_INIT(tsa);
r = bc_services::get_first_service_attachment_by_id(decrypted_items, BC_ESCROW_SERVICE_ID, BC_ESCROW_SERVICE_INSTRUCTION_PRIVATE_DETAILS, tsa);
LOC_CHK(r, "BC_ESCROW_SERVICE_INSTRUCTION_PRIVATE_DETAILS not found in proposal template");
LOC_CHK((tsa.flags & TX_SERVICE_ATTACHMENT_ENCRYPT_BODY) != 0, "tx_service_attachment was not encrypted, tsa.flags: " << static_cast<size_t>(tsa.flags));
r = epee::serialization::load_t_from_json(cpd, tsa.body);
LOC_CHK(r, "proposal template couldn't be loaded from json");
uint64_t flags = get_tx_flags(prop.tx_template);
LOC_CHK(flags == TX_FLAG_SIGNATURE_MODE_SEPARATE, "template has invalid tx flags: " << flags);