Ecosystem/monero-lws
1
0
Fork 0
mirror of https://github.com/vtnerd/monero-lws.git synced 2024-11-17 09:47:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update transaction JSON to reflect daemon changes

Browse source
This commit is contained in:
Lee *!* Clagett 2021-09-02 17:06:07 -04:00
parent 6988fbed76
commit f1cbc052af
1 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/rpc/daemon_zmq.cpp
View file

@ -27,6 +27,7 @@
#include "daemon_zmq.h" #include "daemon_zmq.h"
#include <boost/optional/optional.hpp>
#include "crypto/crypto.h" // monero/src #include "crypto/crypto.h" // monero/src
#include "rpc/message_data_structs.h" // monero/src #include "rpc/message_data_structs.h" // monero/src
#include "wire/crypto.h" #include "wire/crypto.h"
@ -57,13 +58,28 @@ namespace rct
static void read_bytes(wire::json_reader& source, rctSig& self) static void read_bytes(wire::json_reader& source, rctSig& self)
{ {
boost::optional<std::vector<ecdhTuple>> ecdhInfo;
boost::optional<ctkeyV> outPk;
boost::optional<xmr_amount> txnFee;
self.outPk.reserve(default_inputs); self.outPk.reserve(default_inputs);
wire::object(source, wire::object(source,
WIRE_FIELD(type), WIRE_FIELD(type),
wire::field("encrypted", std::ref(self.ecdhInfo)), wire::optional_field("encrypted", std::ref(ecdhInfo)),
wire::field("commitments", std::ref(self.outPk)), wire::optional_field("commitments", std::ref(outPk)),
wire::field("fee", std::ref(self.txnFee)) wire::optional_field("fee", std::ref(txnFee))
); );
if (self.type != RCTTypeNull)
{
if (!ecdhInfo || !outPk || !txnFee)
WIRE_DLOG_THROW(wire::error::schema::missing_key, "Expected fields `encrypted`, `commitments`, and `fee`");
self.ecdhInfo = std::move(*ecdhInfo);
self.outPk = std::move(*outPk);
self.txnFee = std::move(*txnFee);
}
else if (ecdhInfo || outPk || txnFee)
WIRE_DLOG_THROW(wire::error::schema::invalid_key, "Did not expected `encrypted`, `commitments`, or `fee`");
} }
} // rct } // rct