DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge branch 'jahway603' into dev

Browse Source
This commit is contained in:
jahway603
2023-04-03 23:30:32 +00:00
parent d1b649825a 10eb871026
commit 188384cf85
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/wallet/wallet.cpp
View File

@@ -2273,6 +2273,10 @@ int64_t CWalletTx::GetTxTime() const
return n ? n : nTimeReceived; return n ? n : nTimeReceived;
} }
<<<<<<< HEAD
=======
>>>>>>> origin/dev
// GetAmounts will determine the transparent debits and credits for a given wallet tx. // GetAmounts will determine the transparent debits and credits for a given wallet tx.
void CWalletTx::GetAmounts(list<COutputEntry>& listReceived, void CWalletTx::GetAmounts(list<COutputEntry>& listReceived,
list<COutputEntry>& listSent, CAmount& nFee, string& strSentAccount, const isminefilter& filter) const list<COutputEntry>& listSent, CAmount& nFee, string& strSentAccount, const isminefilter& filter) const