github-wownero/wownero-cpp
1
0
Fork 0
mirror of https://github.com/wownero/wownero-cpp.git synced 2026-10-17 15:21:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

testGetTxsWithConfiguration() passing;

Browse Source 
implement model copies (wip)
This commit is contained in:
woodser
2019-07-30 09:35:19 -04:00
parent c35a5df21d
commit 482c97d0bf
5 changed files with 69 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/daemon/MoneroDaemonModel.cpp
+15 -1
View File
@@ -409,6 +409,13 @@ namespace monero {
// --------------------------- MONERO KEY IMAGE -----------------------------
shared_ptr<MoneroKeyImage> MoneroKeyImage::copy(const shared_ptr<MoneroKeyImage>& src, const shared_ptr<MoneroKeyImage>& tgt) const {
if (this != src.get()) throw runtime_error("this != src");
tgt->hex = src->hex;
tgt->signature = src->signature;
return tgt;
}
boost::property_tree::ptree MoneroKeyImage::toPropertyTree() const {
boost::property_tree::ptree node;
if (hex != boost::none) node.put("hex", *hex);
@@ -423,7 +430,14 @@ namespace monero {
// ------------------------------ MONERO OUTPUT -----------------------------
shared_ptr<MoneroOutput> MoneroOutput::copy(const shared_ptr<MoneroOutput>& src, const shared_ptr<MoneroOutput>& tgt) const {
throw runtime_error("MoneroOutput::copy() not implemented");
if (this != src.get()) throw runtime_error("this != src");
tgt->tx = src->tx; // reference same parent tx by default
if (src->keyImage != boost::none) tgt->keyImage = src->keyImage.get()->copy(src->keyImage.get(), make_shared<MoneroKeyImage>());
tgt->amount = src->amount;
tgt->index = src->index;
if (!src->ringOutputIndices.empty()) tgt->ringOutputIndices = vector<uint32_t>(src->ringOutputIndices);
tgt->stealthPublicKey = src->stealthPublicKey;
return tgt;
}
boost::property_tree::ptree MoneroOutput::toPropertyTree() const {
src/daemon/MoneroDaemonModel.h
+1
View File
@@ -205,6 +205,7 @@ namespace monero {
boost::optional<string> hex;
boost::optional<string> signature;
shared_ptr<MoneroKeyImage> copy(const shared_ptr<MoneroKeyImage>& src, const shared_ptr<MoneroKeyImage>& tgt) const;
boost::property_tree::ptree toPropertyTree() const;
void merge(const shared_ptr<MoneroKeyImage>& self, const shared_ptr<MoneroKeyImage>& other);
};
src/wallet/MoneroWallet.cpp
+5 -3
View File
@@ -1394,10 +1394,12 @@ namespace monero {
if (request.txRequest == boost::none) req = request.copy(make_shared<MoneroTransferRequest>(request), make_shared<MoneroTransferRequest>());
else {
shared_ptr<MoneroTxRequest> txReq = request.txRequest.get()->copy(request.txRequest.get(), make_shared<MoneroTxRequest>());
if (request.txRequest.get()->transferRequest.get().get() == &request) req = txReq->transferRequest.get();
else {
if (request.txRequest.get()->transferRequest != boost::none && request.txRequest.get()->transferRequest.get().get() == &request) {
req = txReq->transferRequest.get();
} else {
if (request.txRequest.get()->transferRequest != boost::none) throw new runtime_error("Transfer request's tx request must be a circular reference or null");
req = request.copy(make_shared<MoneroTransferRequest>(request), make_shared<MoneroTransferRequest>());
shared_ptr<MoneroTransferRequest> requestSp = make_shared<MoneroTransferRequest>(request); // convert request to shared pointer for copy
req = requestSp->copy(requestSp, make_shared<MoneroTransferRequest>());
req->txRequest = txReq;
}
}
src/wallet/MoneroWalletModel.cpp
+47 -11
View File
@@ -121,7 +121,7 @@ namespace monero {
if (!src->incomingTransfers.empty()) {
tgt->incomingTransfers = vector<shared_ptr<MoneroIncomingTransfer>>();
for (const shared_ptr<MoneroIncomingTransfer>& transfer : src->incomingTransfers) {
shared_ptr<MoneroIncomingTransfer> transferCopy = transfer->copy(transfer, shared_ptr<MoneroIncomingTransfer>());
shared_ptr<MoneroIncomingTransfer> transferCopy = transfer->copy(transfer, make_shared<MoneroIncomingTransfer>());
transferCopy->tx = tgt;
tgt->incomingTransfers.push_back(transferCopy);
}
@@ -211,6 +211,7 @@ namespace monero {
tgt->includeOutputs = src->includeOutputs;
if (src->transferRequest != boost::none) tgt->transferRequest = src->transferRequest.get()->copy(src->transferRequest.get(), make_shared<MoneroTransferRequest>());
if (src->outputRequest != boost::none) tgt->outputRequest = src->outputRequest.get()->copy(src->outputRequest.get(), make_shared<MoneroOutputRequest>());
return tgt;
};
boost::property_tree::ptree MoneroTxRequest::toPropertyTree() const {
@@ -281,6 +282,14 @@ namespace monero {
// -------------------------- MONERO DESTINATION ----------------------------
shared_ptr<MoneroDestination> MoneroDestination::copy(const shared_ptr<MoneroDestination>& src, const shared_ptr<MoneroDestination>& tgt) const {
MTRACE("MoneroDestination::copy(const shared_ptr<MoneroDestination>& src, const shared_ptr<MoneroDestination>& tgt)");
if (this != src.get()) throw runtime_error("this != src");
tgt->address = src->address;
tgt->amount = src->amount;
return tgt;
};
boost::property_tree::ptree MoneroDestination::toPropertyTree() const {
boost::property_tree::ptree node;
if (address != boost::none) node.put("address", *address);
@@ -291,8 +300,13 @@ namespace monero {
// ---------------------------- MONERO TRANSFER -----------------------------
shared_ptr<MoneroTransfer> MoneroTransfer::copy(const shared_ptr<MoneroTransfer>& src, const shared_ptr<MoneroTransfer>& tgt) const {
throw runtime_error("MoneroTransfer::copy() not implemented");
};
MTRACE("MoneroTransfer::copy(const shared_ptr<MoneroTransfer>& src, const shared_ptr<MoneroTransfer>& tgt)");
tgt->tx = src->tx; // reference parent tx by default
tgt->amount = src->amount;
tgt->accountIndex = src->accountIndex;
tgt->numSuggestedConfirmations = src->numSuggestedConfirmations;
return tgt;
}
boost::property_tree::ptree MoneroTransfer::toPropertyTree() const {
boost::property_tree::ptree node;
@@ -329,10 +343,13 @@ namespace monero {
// ----------------------- MONERO INCOMING TRANSFER -------------------------
shared_ptr<MoneroIncomingTransfer> MoneroIncomingTransfer::copy(const shared_ptr<MoneroTransfer>& src, const shared_ptr<MoneroTransfer>& tgt) const {
throw runtime_error("MoneroIncomingTransfer::copy(transfer) not implemented");
};
return copy(static_pointer_cast<MoneroIncomingTransfer>(src), static_pointer_cast<MoneroIncomingTransfer>(tgt));
}
shared_ptr<MoneroIncomingTransfer> MoneroIncomingTransfer::copy(const shared_ptr<MoneroIncomingTransfer>& src, const shared_ptr<MoneroIncomingTransfer>& tgt) const {
throw runtime_error("MoneroIncomingTransfer::copy(inTransfer) not implemented");
};
@@ -359,7 +376,7 @@ namespace monero {
// ----------------------- MONERO OUTGOING TRANSFER -------------------------
shared_ptr<MoneroOutgoingTransfer> MoneroOutgoingTransfer::copy(const shared_ptr<MoneroTransfer>& src, const shared_ptr<MoneroTransfer>& tgt) const {
throw runtime_error("MoneroOutgoingTransfer::copy(transfer) not implemented");
return copy(static_pointer_cast<MoneroOutgoingTransfer>(src), static_pointer_cast<MoneroOutgoingTransfer>(tgt));
};
shared_ptr<MoneroOutgoingTransfer> MoneroOutgoingTransfer::copy(const shared_ptr<MoneroOutgoingTransfer>& src, const shared_ptr<MoneroOutgoingTransfer>& tgt) const {
@@ -391,13 +408,30 @@ namespace monero {
// ----------------------- MONERO TRANSFER REQUEST --------------------------
shared_ptr<MoneroTransferRequest> MoneroTransferRequest::copy(const shared_ptr<MoneroTransfer>& src, const shared_ptr<MoneroTransfer>& tgt) const {
MTRACE("MoneroTransferRequest::copy(const shared_ptr<MoneroTransfer>& src, const shared_ptr<MoneroTransfer>& tgt");
throw runtime_error("MoneroTransferRequest::copy(transfer) not implemented");
return copy(static_pointer_cast<MoneroTransferRequest>(src), static_pointer_cast<MoneroTransfer>(tgt));
};
shared_ptr<MoneroTransferRequest> MoneroTransferRequest::copy(const shared_ptr<MoneroTransferRequest>& src, const shared_ptr<MoneroTransferRequest>& tgt) const {
MTRACE("MoneroTransferRequest::copy(const shared_ptr<MoneroTransferRequest>& src, const shared_ptr<MoneroTransferRequest>& tgt)");
throw runtime_error("MoneroTransferRequest::copy(request) not implemented");
if (this != src.get()) throw runtime_error("this != src");
// copy base class
MoneroTransfer::copy(static_pointer_cast<MoneroTransfer>(src), static_pointer_cast<MoneroTransfer>(tgt));
// copy extensions
tgt->isIncoming = src->isIncoming;
tgt->address = src->address;
if (!src->addresses.empty()) tgt->addresses = vector<string>(src->addresses);
tgt->subaddressIndex = src->subaddressIndex;
if (!src->subaddressIndices.empty()) tgt->subaddressIndices = vector<uint32_t>(src->subaddressIndices);
if (!src->destinations.empty()) {
for (const shared_ptr<MoneroDestination>& destination : src->destinations) {
tgt->destinations.push_back(destination->copy(destination, make_shared<MoneroDestination>()));
}
}
tgt->hasDestinations = src->hasDestinations;
tgt->txRequest = src->txRequest;
return tgt;
};
boost::optional<bool> MoneroTransferRequest::getIsIncoming() const { return isIncoming; }
@@ -524,15 +558,17 @@ namespace monero {
// ------------------------ MONERO OUTPUT REQUEST ---------------------------
shared_ptr<MoneroOutputRequest> MoneroOutputRequest::copy(const shared_ptr<MoneroOutput>& src, const shared_ptr<MoneroOutput>& tgt) const {
throw runtime_error("MoneroOutputRequest::copy(output) not implemented");
return MoneroOutputRequest::copy(static_pointer_cast<MoneroOutputRequest>(src), static_pointer_cast<MoneroOutputRequest>(tgt));
};
shared_ptr<MoneroOutputRequest> MoneroOutputRequest::copy(const shared_ptr<MoneroOutputWallet>& src, const shared_ptr<MoneroOutputWallet>& tgt) const {
throw runtime_error("MoneroOutputRequest::copy(outputWallet) not implemented");
return MoneroOutputRequest::copy(static_pointer_cast<MoneroOutputRequest>(src), static_pointer_cast<MoneroOutputRequest>(tgt));
};
shared_ptr<MoneroOutputRequest> MoneroOutputRequest::copy(const shared_ptr<MoneroOutputRequest>& src, const shared_ptr<MoneroOutputRequest>& tgt) const {
throw runtime_error("MoneroOutputRequest::copy(outputRequest) not implemented");
if (this != src.get()) throw runtime_error("this != src");
throw runtime_error("MoneroOutputRequest::copy() not implemented");
};
boost::property_tree::ptree MoneroOutputRequest::toPropertyTree() const {
src/wallet/MoneroWalletModel.h
+1
View File
@@ -135,6 +135,7 @@ namespace monero {
boost::optional<string> address;
boost::optional<uint64_t> amount;
shared_ptr<MoneroDestination> copy(const shared_ptr<MoneroDestination>& src, const shared_ptr<MoneroDestination>& tgt) const;
boost::property_tree::ptree toPropertyTree() const;
};