XHV fix

package.json

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

src/cryptonote_core/cryptonote_basic.h

@@ -258,7 +258,7 @@ namespace cryptonote
     uint64_t amount_burnt;
     uint64_t amount_minted;
     std::vector<uint64_t> output_unlock_times;
-    size_t collateral_index; // index to the outputs vector that denotes the collateral output.
+    std::vector<uint32_t> collateral_indices;
 
     //
     // NOTE: Loki specific
@@ -313,10 +313,15 @@ namespace cryptonote
         if (version >= POU_TRANSACTION_VERSION && vout_xhv.size() != output_unlock_times.size()) return false;
         VARINT_FIELD(amount_burnt)
         VARINT_FIELD(amount_minted)
-        if (version >= COLLATERAL_TRANSACTION_VERSION) {
+        if (version >= COLLATERAL_TRANSACTION_VERSION && amount_burnt) {
-          VARINT_FIELD(collateral_index)
+          FIELD(collateral_indices)
-          if (collateral_index >= vout.size())
+          if (collateral_indices.size() != 2) {
             return false;
+          }
+          for (const auto vout_idx: collateral_indices) {
+            if (vout_idx >= vout.size())
+              return false;
+          }
         }
       }
     END_SERIALIZE()
@@ -665,13 +670,6 @@ namespace cryptonote
   {
     crypto::public_key pub;
     crypto::secret_key sec;
-
-    static inline keypair generate()
-    {
-      keypair k;
-      generate_keys(k.pub, k.sec);
-      return k;
-    }
   };
   //---------------------------------------------------------------