Aeon support

2019-10-25 17:22:31 -07:00
parent f382894d9c
commit 02d48ecc72
4 changed files with 19 additions and 8 deletions
@@ -429,14 +429,23 @@ namespace cryptonote
    uint8_t minor_version;
    uint64_t timestamp;
    crypto::hash prev_id;
-    uint32_t nonce;
+    uint64_t nonce;

    BEGIN_SERIALIZE()
      VARINT_FIELD(major_version)
      VARINT_FIELD(minor_version)
      if (blob_type != BLOB_TYPE_FORKNOTE2) VARINT_FIELD(timestamp)
      FIELD(prev_id)
-      if (blob_type != BLOB_TYPE_FORKNOTE2) FIELD(nonce)
+      if (blob_type != BLOB_TYPE_FORKNOTE2) {
+        if (blob_type == BLOB_TYPE_AEON) {
+          FIELD(nonce)
+        } else {
+          uint32_t nonce32;
+          if (typename Archive<W>::is_saving())  nonce32 = (uint32_t)nonce;
+          FIELD_N("nonce", nonce32);
+          if (!typename Archive<W>::is_saving()) nonce = nonce32;
+        }
+      }
    END_SERIALIZE()
  };