diff --git a/src/wallet/MoneroWallet.cpp b/src/wallet/MoneroWallet.cpp index ac44c85..f1a79d7 100644 --- a/src/wallet/MoneroWallet.cpp +++ b/src/wallet/MoneroWallet.cpp @@ -1160,6 +1160,11 @@ namespace monero { return subaddress; } + vector> MoneroWallet::getTxs() const { + MoneroTxRequest request; + return getTxs(request); + } + vector> MoneroWallet::getTxs(MoneroTxRequest& request) const { cout << "getTxs(request)" << endl; @@ -1318,6 +1323,7 @@ namespace monero { wallet2->get_payments(payments, minHeight, maxHeight, accountIndex, subaddressIndices); for (std::list>::const_iterator i = payments.begin(); i != payments.end(); ++i) { shared_ptr tx = buildTxWithIncomingTransfer(*wallet2, chainHeight, i->first, i->second); + if (tx->getHeight().get() != 360559l) continue; mergeTx(tx, txMap, false); } } @@ -1330,6 +1336,7 @@ namespace monero { wallet2->get_payments_out(payments, minHeight, maxHeight, accountIndex, subaddressIndices); for (std::list>::const_iterator i = payments.begin(); i != payments.end(); ++i) { shared_ptr tx = buildTxWithOutgoingTransfer(*wallet2, chainHeight, i->first, i->second); + if (tx->getHeight().get() != 360559l) continue; mergeTx(tx, txMap, false); } } @@ -1342,6 +1349,7 @@ namespace monero { wallet2->get_unconfirmed_payments_out(upayments, accountIndex, subaddressIndices); for (std::list>::const_iterator i = upayments.begin(); i != upayments.end(); ++i) { shared_ptr tx = buildTxWithOutgoingTransferUnconfirmed(*wallet2, i->first, i->second); + if (tx->getHeight().get() != 360559l) continue; if (txReq.isFailed != boost::none && txReq.isFailed.get() != tx->isFailed.get()) continue; // skip merging if tx unrequested mergeTx(tx, txMap, false); } @@ -1356,6 +1364,7 @@ namespace monero { wallet2->get_unconfirmed_payments(payments, accountIndex, subaddressIndices); for (std::list>::const_iterator i = payments.begin(); i != payments.end(); ++i) { shared_ptr tx = buildTxWithIncomingTransferUnconfirmed(*wallet2, i->first, i->second); + if (tx->getHeight().get() != 360559l) continue; mergeTx(tx, txMap, false); } } diff --git a/src/wallet/MoneroWallet.h b/src/wallet/MoneroWallet.h index 31aae81..8096a36 100644 --- a/src/wallet/MoneroWallet.h +++ b/src/wallet/MoneroWallet.h @@ -526,13 +526,13 @@ namespace monero { // */ // public MoneroTxWallet getTx(string txId); // -// /** -// * Get all wallet transactions. Wallet transactions contain one or more -// * transfers that are either incoming or outgoing to the wallet. -// * -// * @return all wallet transactions -// */ -// public List getTxs(); + /** + * Get all wallet transactions. Wallet transactions contain one or more + * transfers that are either incoming or outgoing to the wallet. + * + * @return all wallet transactions + */ + vector> getTxs() const; // // /** // * Get wallet transactions by id.