Moved version

Update cryptonote utils for Loki hardfork 11

package.json

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

src/cryptonote_config.h

@@ -3,9 +3,11 @@
 #define CURRENT_TRANSACTION_VERSION 1
 
 enum BLOB_TYPE {
-  BLOB_TYPE_CRYPTONOTE  = 0,
-  BLOB_TYPE_FORKNOTE1   = 1,
-  BLOB_TYPE_FORKNOTE2   = 2,
-  BLOB_TYPE_CRYPTONOTE2 = 3, // Masari
-  BLOB_TYPE_CRYPTONOTE_RYO = 4, // Ryo
+  BLOB_TYPE_CRYPTONOTE      = 0,
+  BLOB_TYPE_FORKNOTE1       = 1,
+  BLOB_TYPE_FORKNOTE2       = 2,
+  BLOB_TYPE_CRYPTONOTE2     = 3, // Masari
+  BLOB_TYPE_CRYPTONOTE_RYO  = 4, // Ryo
+  BLOB_TYPE_CRYPTONOTE_LOKI = 5, // Loki
+  BLOB_TYPE_CRYPTONOTE3     = 6, // Masari
 };

src/cryptonote_core/cryptonote_basic.h

@@ -137,6 +137,15 @@ namespace cryptonote
     END_SERIALIZE()
   };
 
+  enum loki_version
+  {
+    loki_version_0 = 0,
+    loki_version_1,
+    loki_version_2,
+    loki_version_3_per_output_unlock_times,
+    loki_version_4_tx_types,
+  };
+
   class transaction_prefix
   {
 
@@ -151,12 +160,45 @@ namespace cryptonote
     //extra
     std::vector<uint8_t> extra;
 
+    //
+    // NOTE: Loki specific
+    //
+    std::vector<uint64_t> output_unlock_times;
+    enum loki_type_t
+    {
+      loki_type_standard,
+      loki_type_deregister,
+      loki_type_key_image_unlock,
+      loki_type_count,
+    };
+
+    union
+    {
+      bool is_deregister;
+      uint16_t type;
+    };
+
     BEGIN_SERIALIZE()
       VARINT_FIELD(version)
+      if (version > loki_version_2 && blob_type == BLOB_TYPE_CRYPTONOTE_LOKI)
+      {
+        FIELD(output_unlock_times)
+        if (version == loki_version_3_per_output_unlock_times)
+          FIELD(is_deregister)
+      }
       VARINT_FIELD(unlock_time)
       FIELD(vin)
       FIELD(vout)
+      if (blob_type == BLOB_TYPE_CRYPTONOTE_LOKI)
+      {
+        if (version >= loki_version_3_per_output_unlock_times && vout.size() != output_unlock_times.size()) return false;
+      }
       FIELD(extra)
+      if (blob_type == BLOB_TYPE_CRYPTONOTE_LOKI && version >= loki_version_4_tx_types)
+      {
+        VARINT_FIELD(type)
+        if (static_cast<uint16_t>(type) >= loki_type_count) return false;
+      }
     END_SERIALIZE()
 
 
@@ -177,7 +219,7 @@ namespace cryptonote
     BEGIN_SERIALIZE_OBJECT()
       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.begin_array();
@@ -390,6 +432,7 @@ namespace cryptonote
 
     transaction miner_tx;
     std::vector<crypto::hash> tx_hashes;
+    mutable crypto::hash uncle = cryptonote::null_hash;
 
     void set_blob_type(enum BLOB_TYPE bt) { miner_tx.blob_type = blob_type = bt; }
 
@@ -402,6 +445,10 @@ namespace cryptonote
       }
       FIELD(miner_tx)
       FIELD(tx_hashes)
+      if (blob_type == BLOB_TYPE_CRYPTONOTE3)
+      {
+        FIELD(uncle)
+      }
     END_SERIALIZE()
   };
 

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);
@@ -433,7 +433,9 @@ namespace cryptonote
     crypto::hash tree_root_hash = get_tx_tree_hash(b);
     blob.append(reinterpret_cast<const char*>(&tree_root_hash), sizeof(tree_root_hash));
     blob.append(tools::get_varint_data(b.tx_hashes.size()+1));
-
+    if (b.blob_type == BLOB_TYPE_CRYPTONOTE3) {
+      blob.append(reinterpret_cast<const char*>(&b.uncle), sizeof(b.uncle));
+    }
     return true;
   }
   //---------------------------------------------------------------

src/serialization/serialization.h

@@ -45,6 +45,13 @@ inline bool do_serialize(Archive &ar, T &v)
   return ::serializer<Archive, T>::serialize(ar, v);
 }
 
+template <class Archive>
+inline bool do_serialize(Archive &ar, bool &v)
+{
+  ar.serialize_blob(&v, sizeof(v));
+  return true;
+}
+
 #ifndef __GNUC__
 #ifndef constexpr
 #define constexpr