oxen-io
/
oxen-core
mirror of https://github.com/oxen-io/oxen-core.git
2
1
Fork 0
Code Issues Projects Releases Wiki Activity

Make accruedBalance address parameter optional 

If omitted it looks up the current wallet primary address (which is
usually what we want).
This commit is contained in:
Jason Rhinelander 2022-06-10 17:18:58 -03:00
parent 90cc745987
commit dedc7d351f
No known key found for this signature in database
GPG Key ID: C4992CE7A88D4262
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wallet/api/wallet.cpp
View File

@ -1064,9 +1064,11 @@ uint64_t WalletImpl::unlockedBalance(uint32_t accountIndex) const
}
EXPORT
uint64_t WalletImpl::accruedBalance(const std::string& address) const
uint64_t WalletImpl::accruedBalance(std::optional<std::string> address) const
{
return wallet()->get_batched_amount(address);
if (!address)
address = this->address();
return wallet()->get_batched_amount(*address);
}
EXPORT

2
src/wallet/api/wallet.h
View File

@ -118,7 +118,7 @@ public:
bool trustedDaemon() const override;
uint64_t balance(uint32_t accountIndex = 0) const override;
uint64_t unlockedBalance(uint32_t accountIndex = 0) const override;
uint64_t accruedBalance(const std::string& address) const override;
uint64_t accruedBalance(std::optional<std::string> address = std::nullopt) const override;
std::vector<Wallet::stake_info>* listCurrentStakes() const override;
uint64_t blockChainHeight() const override;
uint64_t approximateBlockChainHeight() const override;

3
src/wallet/api/wallet2_api.h
View File

@ -611,9 +611,10 @@ struct Wallet
/**
* @brief accruedBalance - returns the accounts balance that has been batched and yet to be paid.
* @param address - the address to look up; if omitted, looks up the current primary wallet address.
* @return
*/
virtual uint64_t accruedBalance(const std::string& address) const = 0;
virtual uint64_t accruedBalance(std::optional<std::string> address = std::nullopt) const = 0;
// Information returned about stakes in listCurrentStakes()
struct stake_info {