diff --git a/src/wallet/MoneroWallet.cpp b/src/wallet/MoneroWallet.cpp index 99552a2..c4d0b70 100644 --- a/src/wallet/MoneroWallet.cpp +++ b/src/wallet/MoneroWallet.cpp @@ -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(), 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; diff --git a/src/wallet/MoneroWallet.h b/src/wallet/MoneroWallet.h index 100b293..fe3310b 100644 --- a/src/wallet/MoneroWallet.h +++ b/src/wallet/MoneroWallet.h @@ -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 = ""); diff --git a/src/wallet/MoneroWalletModel.cpp b/src/wallet/MoneroWalletModel.cpp index f36c80d..5ca84d9 100644 --- a/src/wallet/MoneroWalletModel.cpp +++ b/src/wallet/MoneroWalletModel.cpp @@ -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)); diff --git a/src/wallet/MoneroWalletModel.h b/src/wallet/MoneroWalletModel.h index 0805043..2601643 100644 --- a/src/wallet/MoneroWalletModel.h +++ b/src/wallet/MoneroWalletModel.h @@ -107,7 +107,6 @@ namespace monero { struct MoneroAccount : public SerializableStruct { boost::optional index; boost::optional primaryAddress; - boost::optional label; boost::optional balance; boost::optional unlockedBalance; boost::optional tag; diff --git a/todo.txt b/todo.txt index be44688..932ce48 100644 --- a/todo.txt +++ b/todo.txt @@ -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