From 5bda5f949e8d9ca6225dc1395a0acb05a0f5d0f4 Mon Sep 17 00:00:00 2001 From: MoneroOcean Date: Sat, 26 Jan 2019 09:19:31 -0800 Subject: [PATCH] MSR fixes --- package.json | 2 +- src/cryptonote_core/cryptonote_basic.h | 2 +- src/cryptonote_core/cryptonote_format_utils.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 59d98b0..bdd4e42 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cryptoforknote-util", - "version": "4.0.0", + "version": "4.0.2", "main": "cryptoforknote-util", "author": { "name": "LucasJones", diff --git a/src/cryptonote_core/cryptonote_basic.h b/src/cryptonote_core/cryptonote_basic.h index 83e94c6..80de4cf 100644 --- a/src/cryptonote_core/cryptonote_basic.h +++ b/src/cryptonote_core/cryptonote_basic.h @@ -185,7 +185,7 @@ namespace cryptonote BEGIN_SERIALIZE_OBJECT() FIELDS(*static_cast(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.begin_array(); diff --git a/src/cryptonote_core/cryptonote_format_utils.cpp b/src/cryptonote_core/cryptonote_format_utils.cpp index bf51cfd..458f8a8 100644 --- a/src/cryptonote_core/cryptonote_format_utils.cpp +++ b/src/cryptonote_core/cryptonote_format_utils.cpp @@ -370,7 +370,7 @@ namespace cryptonote bool get_transaction_hash(const transaction& t, crypto::hash& res, size_t* blob_size) { // 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; return get_object_hash(t, res, blob_size_ref);