Added support for cryptonight v7 and the associated tests.

Author: sumlnoether

multihashing.cpp

@@ -49,7 +49,7 @@ NAN_METHOD(quark) {
     char * input = node::Buffer::Data(target);
     Nan::MaybeLocal<v8::Object> dest = Nan::NewBuffer(32);
     char* output = node::Buffer::Data(dest.ToLocalChecked());
-    
+
     uint32_t input_len = node::Buffer::Length(target);
 
     quark_hash(input, output, input_len);
@@ -86,18 +86,18 @@ NAN_METHOD(scrypt) {
 
    if(!node::Buffer::HasInstance(target))
        return except("Argument should be a buffer object.");
-    
+
    Local<Number> numn = info[1]->ToNumber();
    unsigned int nValue = numn->Value();
    Local<Number> numr = info[2]->ToNumber();
    unsigned int rValue = numr->Value();
-   
+
    char * input = node::Buffer::Data(target);
    Nan::MaybeLocal<v8::Object> dest = Nan::NewBuffer(32);
    char* output = node::Buffer::Data(dest.ToLocalChecked());
 
    uint32_t input_len = node::Buffer::Length(target);
-   
+
    scrypt_N_R_1_256(input, output, nValue, rValue, input_len);
 
    info.GetReturnValue().Set(dest.ToLocalChecked());
@@ -216,7 +216,7 @@ NAN_METHOD(skein) {
     char* output = node::Buffer::Data(dest.ToLocalChecked());
 
     uint32_t input_len = node::Buffer::Length(target);
-    
+
     skein_hash(input, output, input_len);
 
     info.GetReturnValue().Set(dest.ToLocalChecked());
@@ -235,7 +235,7 @@ NAN_METHOD(groestl) {
     char * input = node::Buffer::Data(target);
     Nan::MaybeLocal<v8::Object> dest = Nan::NewBuffer(32);
     char* output = node::Buffer::Data(dest.ToLocalChecked());
-    
+
     uint32_t input_len = node::Buffer::Length(target);
 
     groestl_hash(input, output, input_len);
@@ -256,7 +256,7 @@ NAN_METHOD(groestlmyriad) {
     char * input = node::Buffer::Data(target);
     Nan::MaybeLocal<v8::Object> dest = Nan::NewBuffer(32);
     char* output = node::Buffer::Data(dest.ToLocalChecked());
-    
+
     uint32_t input_len = node::Buffer::Length(target);
 
     groestlmyriad_hash(input, output, input_len);
@@ -277,7 +277,7 @@ NAN_METHOD(blake) {
     char * input = node::Buffer::Data(target);
     Nan::MaybeLocal<v8::Object> dest = Nan::NewBuffer(32);
     char* output = node::Buffer::Data(dest.ToLocalChecked());
-    
+
     uint32_t input_len = node::Buffer::Length(target);
 
     blake_hash(input, output, input_len);
@@ -298,7 +298,7 @@ NAN_METHOD(fugue) {
     char * input = node::Buffer::Data(target);
     Nan::MaybeLocal<v8::Object> dest = Nan::NewBuffer(32);
     char* output = node::Buffer::Data(dest.ToLocalChecked());
-    
+
     uint32_t input_len = node::Buffer::Length(target);
 
     fugue_hash(input, output, input_len);
@@ -319,7 +319,7 @@ NAN_METHOD(qubit) {
     char * input = node::Buffer::Data(target);
     Nan::MaybeLocal<v8::Object> dest = Nan::NewBuffer(32);
     char* output = node::Buffer::Data(dest.ToLocalChecked());
-    
+
     uint32_t input_len = node::Buffer::Length(target);
 
     qubit_hash(input, output, input_len);
@@ -340,7 +340,7 @@ NAN_METHOD(hefty1) {
     char * input = node::Buffer::Data(target);
     Nan::MaybeLocal<v8::Object> dest = Nan::NewBuffer(32);
     char* output = node::Buffer::Data(dest.ToLocalChecked());
-    
+
     uint32_t input_len = node::Buffer::Length(target);
 
     hefty1_hash(input, output, input_len);
@@ -361,7 +361,7 @@ NAN_METHOD(shavite3) {
     char * input = node::Buffer::Data(target);
     Nan::MaybeLocal<v8::Object> dest = Nan::NewBuffer(32);
     char* output = node::Buffer::Data(dest.ToLocalChecked());
-    
+
     uint32_t input_len = node::Buffer::Length(target);
 
     shavite3_hash(input, output, input_len);
@@ -371,14 +371,20 @@ NAN_METHOD(shavite3) {
 
 NAN_METHOD(cryptonight) {
     bool fast = false;
+    uint32_t cn_variant = 0;
 
     if (info.Length() < 1)
         return except("You must provide one argument.");
-    
+
     if (info.Length() >= 2) {
-        if(!info[1]->IsBoolean())
-            return except("Argument 2 should be a boolean");
-        fast = info[1]->ToBoolean()->BooleanValue();
+        if (info.Length() >= 2) {
+            if(info[1]->IsBoolean())
+                fast = info[1]->ToBoolean()->BooleanValue();
+            else if(info[1]->IsUint32())
+                cn_variant = info[1]->ToUint32()->Uint32Value();
+            else
+                return except("Argument 2 should be a boolean or uint32_t");
+        }
     }
 
     Local<Object> target = info[0]->ToObject();
@@ -389,13 +395,16 @@ NAN_METHOD(cryptonight) {
     char * input = node::Buffer::Data(target);
     Nan::MaybeLocal<v8::Object> dest = Nan::NewBuffer(32);
     char* output = node::Buffer::Data(dest.ToLocalChecked());
-    
+
     uint32_t input_len = node::Buffer::Length(target);
 
     if(fast)
         cryptonight_fast_hash(input, output, input_len);
-    else
-        cryptonight_hash(input, output, input_len);
+    else {
+        if (cn_variant > 0 && input_len < 43)
+            return except("Argument must be 43 bytes for monero variant 1+");
+        cryptonight_hash(input, output, input_len, cn_variant);
+    }
 
     info.GetReturnValue().Set(dest.ToLocalChecked());
 }

tests/cryptonight-tests.js

@@ -0,0 +1,16 @@
+const multiHashing = require('../build/Release/multihashing');
+const assert = require('assert');
+
+var cn_data = new Buffer("6465206f6d6e69627573206475626974616e64756d", "hex");
+var cnv1_data = new Buffer("0100fb8e8ac805899323371bb790db19218afd8db8e3755d8b90f39b3d5506a9abce4fa912244500000000ee8146d49fa93ee724deb57d12cbc6c6f3b924d946127c7a97418f9348828f0f02", "hex");
+var cn_hash = new Buffer("2f8e3df40bd11f9ac90c743ca8e32bb391da4fb98612aa3b6cdc639ee00b31f5", "hex");
+var cnv1_hash = new Buffer("c9fae8425d8688dc236bcdbc42fdb42d376c6ec190501aa84b04a4b4cf1ee122", "hex");
+
+hashedData = multiHashing['cryptonight'](cn_data);
+hashedData_v1 = multiHashing['cryptonight'](cnv1_data, 1);
+
+console.log(hashedData);
+console.log(hashedData_v1);
+
+assert.deepEqual(hashedData, cn_hash);
+assert.deepEqual(hashedData_v1, cnv1_hash);

tests/test.js

@@ -0,0 +1,17 @@
+var multiHashing = require('../build/Release/multihashing');
+
+var algorithms = ['keccak', 'groestl', 'skein', 'blake', 'cryptonight', 'cryptonight v7'];
+
+var data = new Buffer("7000000001e980924e4e1109230383e66d62945ff8e749903bea4336755c00000000000051928aff1b4d72416173a8c3948159a09a73ac3bb556aa6bfbcad1a85da7f4c1d13350531e24031b939b9e2b", "hex");
+
+var hashedData = algorithms.map(function(algo){
+    if (algo === 'cryptonight v7'){
+        return multiHashing['cryptonight'](data, 1);
+    }
+    else{
+        return multiHashing[algo](data);
+    }
+});
+
+
+console.log(hashedData);