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

Fix a few serialization functions

Browse source
This commit is contained in:
Lee Clagett 2020-08-20 16:55:51 -04:00
parent a2ff89bc24
commit 535fd2bd97
2 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/db/data.cpp
View file

@ -70,7 +70,7 @@ namespace db
show_key ? std::addressof(self.key) : nullptr;
const bool admin = (self.flags & admin_account);
const bool generated_locally = (self.flags & account_generated_locally);
wire::object(dest,
WIRE_FIELD(id),
wire::field("access_time", self.access),
@ -103,17 +103,17 @@ namespace db
}
}
WIRE_DEFINE_OBJECT(transaction_link, map_transaction_link);
void write_bytes(wire::writer& dest, const output& self)
{
const std::pair<db::extra, std::uint8_t> unpacked =
db::unpack(self.extra);
const bool coinbase = (unpacked.first & lws::db::coinbase_output);
const bool rct = (unpacked.first & lws::db::ringct_output);
const auto rct_mask = rct ? std::addressof(self.ringct_mask) : nullptr;
epee::span<const std::uint8_t> payment_bytes{};
if (unpacked.second == 32)
payment_bytes = epee::as_byte_span(self.payment_id.long_);
@ -146,14 +146,14 @@ namespace db
void map_spend(F& format, T1& self, T2& payment_id)
{
wire::object(format,
wire::field("height", self.link.height),
wire::field("height", std::ref(self.link.height)),
wire::field("tx_hash", std::ref(self.link.tx_hash)),
WIRE_FIELD(image),
WIRE_FIELD(source),
WIRE_FIELD(timestamp),
WIRE_FIELD(unlock_time),
WIRE_FIELD(mixin_count),
wire::optional_field("payment_id", payment_id)
WIRE_FIELD(image),
WIRE_FIELD(source),
WIRE_FIELD(timestamp),
WIRE_FIELD(unlock_time),
WIRE_FIELD(mixin_count),
wire::optional_field("payment_id", std::ref(payment_id))
);
}
}
@ -161,7 +161,7 @@ namespace db
{
boost::optional<crypto::hash> payment_id;
map_spend(source, dest, payment_id);
if (payment_id)
{
dest.length = sizeof(dest.payment_id);
@ -185,8 +185,8 @@ namespace db
{
wire::object(format,
wire::field("key_image", std::ref(self.value)),
wire::field("tx_hash", std::ref(self.link.tx_hash)),
wire::field("height", self.link.height)
wire::field("tx_hash", std::ref(self.link.tx_hash)),
wire::field("height", std::ref(self.link.height))
);
}
}
@ -197,7 +197,7 @@ namespace db
db::view_key const* const key =
show_key ? std::addressof(self.key) : nullptr;
const bool generated = (self.creation_flags & lws::db::account_generated_locally);
wire::object(dest,
WIRE_FIELD(address),
wire::optional_field("view_key", key),

4
src/rpc/daemon_zmq.cpp
View file

@ -85,7 +85,7 @@ namespace cryptonote
{
wire::object(source,
WIRE_FIELD(amount),
wire::variant_field("transaction output variant", std::ref(self.target),
wire::variant_field("transaction output variant", std::ref(self.target),
wire::option<txout_to_key>{"to_key"},
wire::option<txout_to_script>{"to_script"},
wire::option<txout_to_scripthash>{"to_scripthash"}
@ -112,7 +112,7 @@ namespace cryptonote
static void read_bytes(wire::json_reader& source, txin_v& self)
{
wire::object(source,
wire::variant_field("transaction input variant", std::ref(self),
wire::variant_field("transaction input variant", std::ref(self),
wire::option<txin_to_key>{"to_key"},
wire::option<txin_gen>{"gen"},
wire::option<txin_to_script>{"to_script"},