Added SAL support

README.md

@@ -4,7 +4,8 @@ Node-CryptoForkNote-Util with Merged Mining support
 Installing locally and testing
 -----
 ```
-npm install https://github.com/MoneroOcean/node-cryptoforknote-util
+JOBS=$(nproc) npm install https://github.com/MoneroOcean/node-cryptoforknote-util
+node_modules/cryptoforknote-util/tests/run.sh
 ```
 
 Dependencies

binding.gyp

@@ -4,7 +4,7 @@
             "target_name": "cryptoforknote",
             "sources": [
                 "src/main.cc",
-                "src/cryptonote_core/cryptonote_format_utils.cpp",
+                "src/cryptonote_basic/cryptonote_format_utils.cpp",
                 "src/offshore/pricing_record.cpp",
                 "src/zephyr_oracle/pricing_record.cpp",
                 "src/salvium_oracle/pricing_record.cpp",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cryptoforknote-util",
-  "version": "15.5.9",
+  "version": "15.5.12",
   "author": {
     "name": "LucasJones",
     "email": "lucasjonesdev@hotmail.co.uk"

src/cryptonote_basic/account.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "cryptonote_core/cryptonote_basic.h"
+#include "cryptonote_basic.h"
 #include "crypto/crypto.h"
 #include "serialization/keyvalue_serialization.h"
 

src/cryptonote_basic/cryptonote_basic.h

@@ -17,7 +17,6 @@
 #include "serialization/crypto.h"
 #include "serialization/pricing_record.h"
 #include "serialization/zephyr_pricing_record.h"
-#include "serialization/salvium_pricing_record.h"
 #include "serialization/keyvalue_serialization.h" // eepe named serialization
 #include "string_tools.h"
 #include "cryptonote_config.h"
@@ -1078,9 +1077,11 @@ namespace cryptonote
       if (blob_type == BLOB_TYPE_CRYPTONOTE_XTNC || blob_type == BLOB_TYPE_CRYPTONOTE_CUCKOO) FIELD(cycle)
       if (blob_type == BLOB_TYPE_CRYPTONOTE_TUBE) FIELD(cycle40)
       if (blob_type == BLOB_TYPE_CRYPTONOTE_XTA) FIELD(cycle48)
-      if (blob_type == BLOB_TYPE_CRYPTONOTE_XHV) FIELD(pricing_record)
-      else if (blob_type == BLOB_TYPE_CRYPTONOTE_SALVIUM) FIELD(salvium_pricing_record)
-      else if (blob_type == BLOB_TYPE_CRYPTONOTE_ZEPHYR) {
+      if (blob_type == BLOB_TYPE_CRYPTONOTE_XHV) {
+        FIELD(pricing_record)
+      } else if (blob_type == BLOB_TYPE_CRYPTONOTE_SALVIUM) {
+        if (major_version >= 2) FIELD(salvium_pricing_record)
+      } else if (blob_type == BLOB_TYPE_CRYPTONOTE_ZEPHYR) {
         if (major_version >= 4)
         {
           FIELD_N("pricing_record", zephyr_pricing_record)

src/cryptonote_basic/cryptonote_format_utils.h

@@ -4,8 +4,8 @@
 
 #pragma once
 #include "cryptonote_protocol/cryptonote_protocol_defs.h"
-#include "cryptonote_core/cryptonote_basic_impl.h"
-#include "cryptonote_core/difficulty.h"
+#include "cryptonote_basic_impl.h"
+#include "difficulty.h"
 #include "account.h"
 #include "include_base_utils.h"
 #include "crypto/crypto.h"

src/cryptonote_protocol/cryptonote_protocol_defs.h

@@ -6,7 +6,7 @@
 
 #include <list>
 #include "serialization/keyvalue_serialization.h"
-#include "cryptonote_core/cryptonote_basic.h"
+#include "cryptonote_basic/cryptonote_basic.h"
 #include "cryptonote_protocol/blobdatatype.h"
 namespace cryptonote
 {

src/main.cc

@@ -5,8 +5,8 @@
 #include <stdint.h>
 #include <string>
 #include <algorithm>
-#include "cryptonote_core/cryptonote_basic.h"
-#include "cryptonote_core/cryptonote_format_utils.h"
+#include "cryptonote_basic/cryptonote_basic.h"
+#include "cryptonote_basic/cryptonote_format_utils.h"
 #include "common/base58.h"
 #include "serialization/binary_utils.h"
 #include <nan.h>

src/salvium_oracle/pricing_record.h

@@ -42,6 +42,7 @@
 #include <cstdint>
 #include <string>
 #include <cstring>
+#include "serialization/vector.h"
 
 #include "cryptonote_config.h"
 #include "crypto/hash.h"
@@ -73,6 +74,11 @@ namespace salvium_oracle
     bool _load(epee::serialization::portable_storage& src, epee::serialization::section* hparent);
     //! Store in epee p2p format
     bool store(epee::serialization::portable_storage& dest, epee::serialization::section* hparent) const;
+
+    BEGIN_SERIALIZE_OBJECT()
+      VARINT_FIELD(sal)
+      VARINT_FIELD(vsd)
+    END_SERIALIZE()
   };
 
   inline bool operator==(const supply_data& a, const supply_data& b) noexcept
@@ -90,6 +96,12 @@ namespace salvium_oracle
     bool _load(epee::serialization::portable_storage& src, epee::serialization::section* hparent);
     //! Store in epee p2p format
     bool store(epee::serialization::portable_storage& dest, epee::serialization::section* hparent) const;
+
+    BEGIN_SERIALIZE_OBJECT()
+      FIELD(asset_type)
+      VARINT_FIELD(spot_price)
+      VARINT_FIELD(ma_price)
+    END_SERIALIZE()
   };
   
   inline bool operator==(const asset_data& a, const asset_data& b) noexcept
@@ -123,6 +135,15 @@ namespace salvium_oracle
 
     pricing_record& operator=(const pricing_record& orig) noexcept;
     uint64_t operator[](const std::string& asset_type) const;
+
+    BEGIN_SERIALIZE_OBJECT()
+      VARINT_FIELD(pr_version)
+      VARINT_FIELD(height)
+      FIELD(supply)
+      FIELD(assets)
+      VARINT_FIELD(timestamp)
+      FIELD(signature)
+    END_SERIALIZE()
   };
 
   inline bool operator==(const pricing_record& a, const pricing_record& b) noexcept

src/serialization/salvium_pricing_record.h

@@ -1,168 +0,0 @@
-// Copyright (c) 2019, Haven Protocol
-// 
-// All rights reserved.
-// 
-// Redistribution and use in source and binary forms, with or without modification, are
-// permitted provided that the following conditions are met:
-// 
-// 1. Redistributions of source code must retain the above copyright notice, this list of
-//    conditions and the following disclaimer.
-// 
-// 2. Redistributions in binary form must reproduce the above copyright notice, this list
-//    of conditions and the following disclaimer in the documentation and/or other
-//    materials provided with the distribution.
-// 
-// 3. Neither the name of the copyright holder nor the names of its contributors may be
-//    used to endorse or promote products derived from this software without specific
-//    prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// 
-// Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers
-
-#pragma once
-
-#include <vector>
-
-#include "serialization.h"
-#include "salvium_oracle/pricing_record.h"
-#include "cryptonote_config.h"
-
-// read
-template <template <bool> class Archive>
-bool do_serialize(Archive<false> &ar, salvium_oracle::supply_data &sd, uint8_t version)
-{
-  ar.serialize_varint(sd.sal);
-  if (!ar.good())
-    return false;
-  ar.serialize_varint(sd.vsd);
-  if (!ar.good())
-    return false;
-  return true;
-}
-
-// write
-template <template <bool> class Archive>
-bool do_serialize(Archive<true> &ar, salvium_oracle::supply_data &sd, uint8_t version)
-{
-  if (!ar.good())
-    return false;
-  ar.serialize_varint(sd.sal);
-  ar.serialize_varint(sd.vsd);
-  if (!ar.good())
-    return false;
-  return true;
-}
-
-// read
-template <template <bool> class Archive>
-bool do_serialize(Archive<false> &ar, salvium_oracle::asset_data &ad, uint8_t version)
-{
-  ar.serialize_string(ad.asset_type);
-  if (!ar.good())
-    return false;
-  ar.serialize_varint(ad.spot_price);
-  if (!ar.good())
-    return false;
-  ar.serialize_varint(ad.ma_price);
-  if (!ar.good())
-    return false;
-  return true;
-}
-
-// write
-template <template <bool> class Archive>
-bool do_serialize(Archive<true> &ar, salvium_oracle::asset_data &ad, uint8_t version)
-{
-  if (!ar.good())
-    return false;
-  ar.serialize_string(ad.asset_type);
-  if (!ar.good())
-    return false;
-  ar.serialize_varint(ad.spot_price);
-  if (!ar.good())
-    return false;
-  ar.serialize_varint(ad.ma_price);
-  if (!ar.good())
-    return false;
-  return true;
-}
-
-// read
-template <template <bool> class Archive>
-bool do_serialize(Archive<false> &ar, salvium_oracle::pricing_record &pr, uint8_t version)
-{
-  // very basic sanity checks
-  if (!ar.good())
-    return false;
-  ar.serialize_varint(pr.pr_version);
-  if (!ar.good())
-    return false;
-  ar.serialize_varint(pr.height);
-  if (!ar.good())
-    return false;
-  if (!do_serialize(ar, pr.supply, version))
-    return false;
-  /*
-  // The next line should never do anything, but better safe than sorry
-  pr.asset_data.empty();
-  size_t asset_count;
-  ar.begin_array(asset_count);
-  if (!ar.good())
-    return false;
-  for (size_t idx=0; idx<asset_count; idx++) {
-    if (idx > 0) ar.delimit_array();
-    asset_data ad;
-    if (!do_serialize(ar, ad, version))
-      return false;
-    pr.asset_data.emplace_back(ad);
-  }
-  ar.end_array();
-  */
-  if (!do_serialize_container(ar, pr.assets))
-    return false;
-  ar.serialize_varint(pr.timestamp);
-  if (!ar.good())
-    return false;
-  if (!do_serialize_container(ar, pr.signature))
-    return false;
-  return true;
-}
-
-// write
-template <template <bool> class Archive>
-bool do_serialize(Archive<true> &ar, salvium_oracle::pricing_record &pr, uint8_t version)
-{
-  // very basic sanity checks
-  if (!ar.good())
-    return false;
-  ar.serialize_varint(pr.pr_version);
-  if (!ar.good())
-    return false;
-  ar.serialize_varint(pr.height);
-  if (!ar.good())
-    return false;
-  if (!do_serialize(ar, pr.supply, version))
-    return false;
-  if (!do_serialize_container(ar, pr.assets))
-    return false;
-  ar.serialize_varint(pr.timestamp);
-  if (!ar.good())
-    return false;
-  pr.signature.empty();
-  if (!do_serialize_container(ar, pr.signature))
-    return false;
-  return true;
-}
-
-//BLOB_SERIALIZER(salvium_oracle::supply_data);
-//BLOB_SERIALIZER(salvium_oracle::asset_data);
-BLOB_SERIALIZER(salvium_oracle::pricing_record);

tests/run.sh

@@ -0,0 +1,6 @@
+#!/bin/bash -x
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+cd $DIR
+node sal.js || exit 1

tests/sal.js

@@ -0,0 +1,14 @@
+"use strict";
+let u = require('../build/Release/cryptoforknote-util');
+
+const b = Buffer.from(
+'010194a5ebb406f613c4e7514facf3e5b9923c885357b53f2b02f8e17f9721371296b99113035f00000000020001ffcb6d018f9ffec12d03125e128c041c8a2d41fab9ebe2a7a4b10afbef4e134ec7ba3151c8c730a644310353414c3c7334015f99bdbbe70161dafb2da2fd9a4285da893a7519cff350981a959f525c43e5c60211000000000000000000000000000000000001e3c7bfb00b00020001ffcb6d0023016b6961b458286074406192961c1f0e5236455f45fcd6c175c7142d6353a481d60400020000'
+, 'hex');
+const b2 = u.convert_blob(b, 15);
+
+if (b2.toString('hex') === '010194a5ebb406f613c4e7514facf3e5b9923c885357b53f2b02f8e17f9721371296b99113035f00000000ac81ca3e7bc9369e63563923187d2cfdb42eac839c7fe24e6d5d0080c96d758f02') {
+  console.log('PASSED');
+} else {
+  console.log('FAILED: ' + b2);
+  process.exit(1);
+}