Merge pull request #6190

096a9db Wallet: Distingush amounts for a single subaddress (tmoravec)
This commit is contained in:
luigi1111 2020-02-19 22:22:36 -05:00
commit 22a0367398
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
4 changed files with 38 additions and 2 deletions

View file

@ -326,6 +326,7 @@ namespace tools
entry.height = pd.m_block_height;
entry.timestamp = pd.m_timestamp;
entry.amount = pd.m_amount;
entry.amounts = pd.m_amounts;
entry.unlock_time = pd.m_unlock_time;
entry.locked = !m_wallet->is_transfer_unlocked(pd.m_unlock_time, pd.m_block_height);
entry.fee = pd.m_fee;
@ -408,6 +409,7 @@ namespace tools
entry.height = 0;
entry.timestamp = pd.m_timestamp;
entry.amount = pd.m_amount;
entry.amounts = pd.m_amounts;
entry.unlock_time = pd.m_unlock_time;
entry.locked = true;
entry.fee = pd.m_fee;