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

package.json

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

src/cryptonote_core/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/salvium_oracle/pricing_record.cpp

@@ -223,82 +223,12 @@ namespace salvium_oracle
     return (*this).equal(empty_pr);
   }
 
-  bool pricing_record::verifySignature(const std::string& public_key) const
-  {
-    CHECK_AND_ASSERT_THROW_MES(!public_key.empty(), "Pricing record verification failed. NULL public key. PK Size: " << public_key.size());
-
-    // extract the key
-    EVP_PKEY* pubkey;
-    BIO* bio = BIO_new_mem_buf(public_key.c_str(), public_key.size());
-    if (!bio) {
-      return false;
-    }
-    pubkey = PEM_read_bio_PUBKEY(bio, NULL, NULL, NULL);
-    BIO_free(bio);
-    CHECK_AND_ASSERT_THROW_MES(pubkey != NULL, "Pricing record verification failed. NULL public key.");
-
-    // Build the JSON string, so that we can verify the signature
-    std::ostringstream oss;
-    oss << "{\"pr_version\":" << pr_version;
-    oss << ",\"height\":" << height;
-    oss << ",\"supply\":{\"SAL\":" << supply.sal <<",\"VSD\":" << supply.vsd << "}";
-    oss << ",\"assets\":[";
-    bool first = true;
-    for (const auto& asset: assets) {
-      if (first)
-        first=false;
-      else
-        oss << ",";
-      oss << "{\"asset_type\":\"" << asset.asset_type << "\",\"spot_price\":" << asset.spot_price << ",\"ma_price\":" << asset.ma_price << "}";
-    }
-    oss << "]";
-    oss << ",\"timestamp\":" << timestamp;
-    oss << "}";
-    std::string message = oss.str();
-
-    // Create a verify digest from the message
-    EVP_MD_CTX *ctx = EVP_MD_CTX_create();
-    int ret = 0;
-    if (ctx) {
-      ret = EVP_DigestVerifyInit(ctx, NULL, EVP_sha256(), NULL, pubkey);
-      if (ret == 1) {
-        ret = EVP_DigestVerifyUpdate(ctx, message.data(), message.length());
-        if (ret == 1) {
-          ret = EVP_DigestVerifyFinal(ctx, (const unsigned char *)signature.data(), signature.size());
-        }
-      }
-    }
-
-    // Cleanup the context we created
-    EVP_MD_CTX_destroy(ctx);
-    // Cleanup the openssl stuff
-    EVP_PKEY_free(pubkey);
-
-    if (ret == 1)
-      return true;
-
-    // Get the errors from OpenSSL
-    ERR_print_errors_fp (stderr);
-
-    return false;
-  }
-
   // overload for pr validation for block
-  bool pricing_record::valid(cryptonote::network_type nettype, uint32_t hf_version, uint64_t bl_timestamp, uint64_t last_bl_timestamp) const 
+  bool pricing_record::valid(uint32_t hf_version, uint64_t bl_timestamp, uint64_t last_bl_timestamp) const 
   {
-    if (hf_version < HF_VERSION_SLIPPAGE_YIELD) {
-      if (!this->empty())
-        return false;
-    }
-
     if (this->empty())
         return true;
 
-    if (!verifySignature(get_config(nettype).ORACLE_PUBLIC_KEY)) {
-      LOG_ERROR("Invalid pricing record signature.");
-      return false;
-    }
-
     // validate the timestmap
     if (this->timestamp > bl_timestamp + PRICING_RECORD_VALID_TIME_DIFF_FROM_BLOCK) {
       LOG_ERROR("Pricing record timestamp is too far in the future.");

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"
@@ -130,8 +131,7 @@ namespace salvium_oracle
     ~pricing_record() noexcept;
     bool equal(const pricing_record& other) const noexcept;
     bool empty() const noexcept;
-    bool verifySignature(const std::string& public_key) const;
-    bool valid(cryptonote::network_type nettype, uint32_t hf_version, uint64_t bl_timestamp, uint64_t last_bl_timestamp) const;
+    bool valid(uint32_t hf_version, uint64_t bl_timestamp, uint64_t last_bl_timestamp) const;
 
     pricing_record& operator=(const pricing_record& orig) noexcept;
     uint64_t operator[](const std::string& asset_type) const;

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);
+}