vector<shared_ptr<MoneroTx>> txs to avoid slicing, same for outputs

This commit is contained in:
woodser
2019-06-06 14:50:56 -04:00
parent c54600c263
commit 485ef3832b
2 changed files with 4 additions and 5 deletions
+3 -3
View File
@@ -62,8 +62,8 @@ namespace monero {
boost::optional<string> prunableHash;
boost::optional<uint32_t> size;
boost::optional<uint32_t> weight;
vector<MoneroOutput> vins;
vector<MoneroOutput> vouts;
vector<shared_ptr<MoneroOutput>> vins;
vector<shared_ptr<MoneroOutput>> vouts;
vector<uint32_t> outputIndices;
boost::optional<string> metadata;
boost::optional<string> commonTxSets;
@@ -108,7 +108,7 @@ namespace monero {
struct MoneroBlock : public MoneroBlockHeader {
boost::optional<string> hex;
boost::optional<MoneroTx> coinbaseTx;
vector<MoneroTx> txs;
vector<shared_ptr<MoneroTx>> txs;
vector<string> txIds;
};
+1 -2
View File
@@ -125,7 +125,6 @@ namespace monero {
* Models a Monero transaction in the context of a wallet.
*/
struct MoneroTxWallet : public MoneroTx {
vector<MoneroOutputWallet> vouts; // TODO: override vouts with different type?
vector<MoneroIncomingTransfer> incomingTransfers;
boost::optional<MoneroOutgoingTransfer> outgoingTransfer;
boost::optional<uint32_t> numSuggestedConfirmations;
@@ -180,7 +179,7 @@ namespace monero {
*/
struct MoneroOutputRequest : public MoneroOutput {
vector<uint32_t> subaddressIndices;
boost::optional<MoneroTxRequest> txRequest;
boost::optional<shared_ptr<MoneroTxRequest>> txRequest;
};
// --------------------------------- LISTENERS ------------------------------