removed serialisation of unlock_time for txout_to_carrot_v1 output type

This commit is contained in:
Some Random Crypto Guy
2025-05-19 12:17:00 +01:00
parent 59b167f0f3
commit 53db771c35
4 changed files with 1 additions and 5 deletions

View File

@@ -68,7 +68,6 @@ namespace cryptonote
{
crypto::public_key key; // K_o
std::string asset_type;
uint64_t unlock_time;
carrot::view_tag_t view_tag; // vt
carrot::encrypted_janus_anchor_t encrypted_janus_anchor; // anchor_enc

View File

@@ -113,7 +113,6 @@ namespace boost
{
a & x.key;
a & x.asset_type;
a & x.unlock_time;
a & x.view_tag;
a & x.encrypted_janus_anchor;
}

View File

@@ -1328,7 +1328,7 @@ namespace cryptonote
else if (out.target.type() == typeid(txout_to_tagged_key))
output_unlock_time = boost::get< txout_to_tagged_key >(out.target).unlock_time;
else if (out.target.type() == typeid(txout_to_carrot_v1))
output_unlock_time = boost::get<txout_to_carrot_v1>(out.target).unlock_time;
output_unlock_time = 0;
else
{
LOG_ERROR("Unexpected output target type found: " << out.target.type().name() << " - cannot retrieve output_unlock_time");

View File

@@ -626,7 +626,6 @@ void toJsonValue(rapidjson::Writer<epee::byte_stream>& dest, const cryptonote::t
INSERT_INTO_JSON_OBJECT(dest, key, txout.key);
INSERT_INTO_JSON_OBJECT(dest, asset_type, txout.asset_type);
INSERT_INTO_JSON_OBJECT(dest, unlock_time, txout.unlock_time);
INSERT_INTO_JSON_OBJECT(dest, view_tag, txout.view_tag);
INSERT_INTO_JSON_OBJECT(dest, encrypted_janus_anchor, txout.encrypted_janus_anchor);
@@ -642,7 +641,6 @@ void fromJsonValue(const rapidjson::Value& val, cryptonote::txout_to_carrot_v1&
GET_FROM_JSON_OBJECT(val, txout.key, key);
GET_FROM_JSON_OBJECT(val, txout.asset_type, asset_type);
GET_FROM_JSON_OBJECT(val, txout.unlock_time, unlock_time);
GET_FROM_JSON_OBJECT(val, txout.view_tag, view_tag);
GET_FROM_JSON_OBJECT(val, txout.encrypted_janus_anchor, encrypted_janus_anchor);
}