github-wownero/wownero-cpp
1
0
Fork 0
mirror of https://github.com/wownero/wownero-cpp.git synced 2026-10-18 23:58:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

account does not have label

Browse Source
This commit is contained in:
woodser
2019-07-16 07:41:40 -04:00
parent 73d24f4c47
commit 06f0289514
5 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wallet/MoneroWallet.cpp
-2
View File
@@ -1110,7 +1110,6 @@ namespace monero {
MoneroAccount account;
account.index = accountIdx;
account.primaryAddress = getAddress(accountIdx, 0);
account.label = wallet2->get_subaddress_label({accountIdx, 0});
account.balance = wallet2->balance(accountIdx);
account.unlockedBalance = wallet2->unlocked_balance(accountIdx);
if (includeSubaddresses) account.subaddresses = getSubaddressesAux(accountIdx, vector<uint32_t>(), transfers);
@@ -1127,7 +1126,6 @@ namespace monero {
MoneroAccount account;
account.index = wallet2->get_num_subaddress_accounts() - 1;
account.primaryAddress = wallet2->get_subaddress_as_str({account.index.get(), 0});
account.label = label;
account.balance = 0;
account.unlockedBalance = 0;
return account;
src/wallet/MoneroWallet.h
+2 -2
View File
@@ -476,9 +476,9 @@ namespace monero {
MoneroAccount getAccount(const uint32_t accountIdx, const bool includeSubaddresses) const;
/**
* Create a new account.
* Create a new account with a label for the first subaddress.
*
* @param label specifies the label for the account (optional)
* @param label specifies the label for the account's first subaddress (optional)
* @return the created account
*/
MoneroAccount createAccount(const string& label = "");
src/wallet/MoneroWalletModel.cpp
-1
View File
@@ -85,7 +85,6 @@ namespace monero {
boost::property_tree::ptree node;
if (index != boost::none) node.put("index", *index);
if (primaryAddress != boost::none) node.put("primaryAddress", *primaryAddress);
if (label != boost::none) node.put("label", *label);
if (balance != boost::none) node.put("balance", *balance);
if (unlockedBalance != boost::none) node.put("unlockedBalance", *unlockedBalance);
if (!subaddresses.empty()) node.add_child("subaddresses", MoneroUtils::toPropertyTree(subaddresses));
src/wallet/MoneroWalletModel.h
-1
View File
@@ -107,7 +107,6 @@ namespace monero {
struct MoneroAccount : public SerializableStruct {
boost::optional<uint32_t> index;
boost::optional<string> primaryAddress;
boost::optional<string> label;
boost::optional<uint64_t> balance;
boost::optional<uint64_t> unlockedBalance;
boost::optional<string> tag;
todo.txt
+2
View File
@@ -5,6 +5,8 @@ cannot reconcile integrals on getTransfers() test, need to add reconcile debug i
getReserveProofAccount() jni seg fault
testGetTransfers() cannot reconcile integrals: new MoneroTransferRequest().setAccountIndex(subaddress.getAccountIndex()).setSubaddressIndex(subaddress.getIndex())
comb code todos
cleanup MoneroWallet.h/MoneroDaemon.h documentation
gen documentation
MEDIUM PRIORITY
MoneroWallet getChainHeight() calling daemon connection every time, surely better way