aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2020-08-31 16:50:18 -0500
committerluigi1111 <luigi1111w@gmail.com>2020-08-31 16:50:18 -0500
commita51ccc036fdac5ac240354ba5dffdef86c25cff7 (patch)
treeb91408ea6a7a73ca6dee19667afeef41c7e36506 /src
parentMerge pull request #6600 (diff)
parentFix ZMQ pruned bulletproof transactions (diff)
downloadmonero-a51ccc036fdac5ac240354ba5dffdef86c25cff7.tar.xz
Merge pull request #6770
bdc6b10 Fix ZMQ pruned bulletproof transactions (vtnerd)
Diffstat (limited to '')
-rw-r--r--src/rpc/daemon_handler.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/rpc/daemon_handler.cpp b/src/rpc/daemon_handler.cpp
index 0a26a4d5d..248c54afb 100644
--- a/src/rpc/daemon_handler.cpp
+++ b/src/rpc/daemon_handler.cpp
@@ -183,7 +183,11 @@ namespace rpc
{
bwt.transactions.emplace_back();
bwt.transactions.back().pruned = req.prune;
- if (!parse_and_validate_tx_from_blob(blob.second, bwt.transactions.back()))
+
+ const bool parsed = req.prune ?
+ parse_and_validate_tx_base_from_blob(blob.second, bwt.transactions.back()) :
+ parse_and_validate_tx_from_blob(blob.second, bwt.transactions.back());
+ if (!parsed)
{
res.blocks.clear();
res.output_indices.clear();