MSR fixes

This commit is contained in:
MoneroOcean
2019-01-26 09:19:31 -08:00
parent 52bb818185
commit 5bda5f949e
3 changed files with 3 additions and 3 deletions

View File

@@ -1,6 +1,6 @@
{ {
"name": "cryptoforknote-util", "name": "cryptoforknote-util",
"version": "4.0.0", "version": "4.0.2",
"main": "cryptoforknote-util", "main": "cryptoforknote-util",
"author": { "author": {
"name": "LucasJones", "name": "LucasJones",

View File

@@ -185,7 +185,7 @@ namespace cryptonote
BEGIN_SERIALIZE_OBJECT() BEGIN_SERIALIZE_OBJECT()
FIELDS(*static_cast<transaction_prefix *>(this)) FIELDS(*static_cast<transaction_prefix *>(this))
if (version == 1 && blob_type != BLOB_TYPE_CRYPTONOTE2) if (version == 1 && blob_type != BLOB_TYPE_CRYPTONOTE2 && blob_type != BLOB_TYPE_CRYPTONOTE3)
{ {
ar.tag("signatures"); ar.tag("signatures");
ar.begin_array(); ar.begin_array();

View File

@@ -370,7 +370,7 @@ namespace cryptonote
bool get_transaction_hash(const transaction& t, crypto::hash& res, size_t* blob_size) bool get_transaction_hash(const transaction& t, crypto::hash& res, size_t* blob_size)
{ {
// v1 transactions hash the entire blob // v1 transactions hash the entire blob
if (t.version == 1 && t.blob_type != BLOB_TYPE_CRYPTONOTE2) if (t.version == 1 && t.blob_type != BLOB_TYPE_CRYPTONOTE2 && t.blob_type != BLOB_TYPE_CRYPTONOTE3)
{ {
size_t ignored_blob_size, &blob_size_ref = blob_size ? *blob_size : ignored_blob_size; size_t ignored_blob_size, &blob_size_ref = blob_size ? *blob_size : ignored_blob_size;
return get_object_hash(t, res, blob_size_ref); return get_object_hash(t, res, blob_size_ref);