gitea-mirror/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2026-06-12 19:11:36 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10589

Browse Source 
f095abd wallet_rpc_server: preserve payment ID when editing address book (selsta)
This commit is contained in:
tobtoht
2026-06-03 20:38:01 +00:00
parent 22f7743b1f f095abd9aa
commit ab2c0f8f8d
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wallet/wallet_rpc_server.cpp
+3 -3
View File
@@ -3349,14 +3349,14 @@ namespace tools
}
entry.m_address = info.address;
entry.m_is_subaddress = info.is_subaddress;
if (info.has_payment_id)
entry.m_payment_id = info.payment_id;
entry.m_has_payment_id = info.has_payment_id;
entry.m_payment_id = info.has_payment_id ? info.payment_id : crypto::null_hash8;
}
if (req.set_description)
entry.m_description = req.description;
if (!m_wallet->set_address_book_row(req.index, entry.m_address, req.set_address && entry.m_has_payment_id ? &entry.m_payment_id : NULL, entry.m_description, entry.m_is_subaddress))
if (!m_wallet->set_address_book_row(req.index, entry.m_address, entry.m_has_payment_id ? &entry.m_payment_id : NULL, entry.m_description, entry.m_is_subaddress))
{
er.code = WALLET_RPC_ERROR_CODE_UNKNOWN_ERROR;
er.message = "Failed to edit address book entry";
tests/functional_tests/address_book.py
+12
View File
@@ -231,6 +231,18 @@ class AddressBookTest():
res = wallet.get_address_book([1])
assert len(res.entries) == 1
assert e == res.entries[0]
# change integrated address to standard address
res = wallet.edit_address_book(2, address = '42ey1afDFnn4886T7196doS9GPMzexD9gXpsZJDwVjeRVdFCSoHnv7KPbBeGpzJBzHRCAs9UxqeoyFQMYbqSWYTfJJQAWDm')
res = wallet.get_address_book([2])
e = res.entries[0]
assert e.address == '42ey1afDFnn4886T7196doS9GPMzexD9gXpsZJDwVjeRVdFCSoHnv7KPbBeGpzJBzHRCAs9UxqeoyFQMYbqSWYTfJJQAWDm'
# change integrated address to another integrated address
res = wallet.make_integrated_address()
integrated_address_2 = res.integrated_address
res = wallet.edit_address_book(2, address = integrated_address_2)
res = wallet.get_address_book([2])
e = res.entries[0]
assert e.address == integrated_address_2
# empty
wallet.delete_address_book(0)