From 485ef3832b6ce266d9beb63ddcb9cbe065877c63 Mon Sep 17 00:00:00 2001 From: woodser Date: Thu, 6 Jun 2019 14:50:56 -0400 Subject: [PATCH] vector> txs to avoid slicing, same for outputs --- src/daemon/MoneroDaemon.h | 6 +++--- src/wallet/MoneroWallet.h | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/daemon/MoneroDaemon.h b/src/daemon/MoneroDaemon.h index 9621765..cff3931 100644 --- a/src/daemon/MoneroDaemon.h +++ b/src/daemon/MoneroDaemon.h @@ -62,8 +62,8 @@ namespace monero { boost::optional prunableHash; boost::optional size; boost::optional weight; - vector vins; - vector vouts; + vector> vins; + vector> vouts; vector outputIndices; boost::optional metadata; boost::optional commonTxSets; @@ -108,7 +108,7 @@ namespace monero { struct MoneroBlock : public MoneroBlockHeader { boost::optional hex; boost::optional coinbaseTx; - vector txs; + vector> txs; vector txIds; }; diff --git a/src/wallet/MoneroWallet.h b/src/wallet/MoneroWallet.h index 09b255e..5cb3fdd 100644 --- a/src/wallet/MoneroWallet.h +++ b/src/wallet/MoneroWallet.h @@ -125,7 +125,6 @@ namespace monero { * Models a Monero transaction in the context of a wallet. */ struct MoneroTxWallet : public MoneroTx { - vector vouts; // TODO: override vouts with different type? vector incomingTransfers; boost::optional outgoingTransfer; boost::optional numSuggestedConfirmations; @@ -180,7 +179,7 @@ namespace monero { */ struct MoneroOutputRequest : public MoneroOutput { vector subaddressIndices; - boost::optional txRequest; + boost::optional> txRequest; }; // --------------------------------- LISTENERS ------------------------------