Skip to content

Commit

Permalink
updates for Nan 2.x. use copybuffer.
Browse files Browse the repository at this point in the history 
# Conflicts:
#	src/main.cc
  • Loading branch information
Olexandr Tarasenkov committed Jan 29, 2018
1 parent 26c0471 commit 2b2de8f
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 43 deletions.
4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
},
"repository": {
"type": "git",
"url": "https://github.com/LucasJones/node-cryptonote-util.git"
"url": "https://github.com/avtc/node-cryptonote-util_forknote.git"
},
"dependencies" : {
"bindings" : "*",
"nan" : "1"
"nan" : "^2.0.0"
},
"keywords": [
"cryptonight",
Expand Down
85 changes: 44 additions & 41 deletions src/main.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,11 @@
#include "serialization/binary_utils.h"
#include <nan.h>

#define THROW_ERROR_EXCEPTION(x) NanThrowError(x)
#define THROW_ERROR_EXCEPTION_WITH_STATUS_CODE(x, y) NanThrowError(x, y)
#define THROW_ERROR_EXCEPTION(x) Nan::ThrowError(x)

void callback(char* data, void* hint) {
free(data);
}

using namespace node;
using namespace v8;
Expand Down Expand Up @@ -78,12 +81,11 @@ static bool construct_parent_block(const cryptonote::block& b, cryptonote::block
}

NAN_METHOD(convert_blob) {
NanScope();

if (args.Length() < 1)
if (info.Length() < 1)
return THROW_ERROR_EXCEPTION("You must provide one argument.");

Local<Object> target = args[0]->ToObject();
Local<Object> target = info[0]->ToObject();
uint64_t mergedMiningBlockVersion = BLOCK_MAJOR_VERSION_2;
if (args.Length() >= 2) {
mergedMiningBlockVersion = static_cast<uint64_t>(args[1]->ToNumber()->NumberValue());
Expand Down Expand Up @@ -112,18 +114,18 @@ NAN_METHOD(convert_blob) {
return THROW_ERROR_EXCEPTION("Failed to create mining block");
}

NanReturnValue(
NanNewBufferHandle(output.data(), output.size())
v8::Local<v8::Value> returnValue = Nan::CopyBuffer((char*)output.data(), output.size()).ToLocalChecked();
info.GetReturnValue().Set(
returnValue
);
}

NAN_METHOD(get_block_id) {
NanScope();
void get_block_id(const Nan::FunctionCallbackInfo<v8::Value>& info) {

if (args.Length() < 1)
if (info.Length() < 1)
return THROW_ERROR_EXCEPTION("You must provide one argument.");

Local<Object> target = args[0]->ToObject();
Local<Object> target = info[0]->ToObject();
uint64_t mergedMiningBlockVersion = BLOCK_MAJOR_VERSION_2;
if (args.Length() >= 2) {
mergedMiningBlockVersion = static_cast<uint64_t>(args[1]->ToNumber()->NumberValue());
Expand All @@ -143,19 +145,20 @@ NAN_METHOD(get_block_id) {
if (!get_block_hash(b, block_id, mergedMiningBlockVersion))
return THROW_ERROR_EXCEPTION("Failed to calculate hash for block");

NanReturnValue(
NanNewBufferHandle(reinterpret_cast<char*>(&block_id), sizeof(block_id))
char *cstr = reinterpret_cast<char*>(&block_id);
v8::Local<v8::Value> returnValue = Nan::CopyBuffer(cstr, 32).ToLocalChecked();
info.GetReturnValue().Set(
returnValue
);
}

NAN_METHOD(construct_block_blob) {
NanScope();
void construct_block_blob(const Nan::FunctionCallbackInfo<v8::Value>& info) {

if (args.Length() < 2)
if (info.Length() < 2)
return THROW_ERROR_EXCEPTION("You must provide two arguments.");

Local<Object> block_template_buf = args[0]->ToObject();
Local<Object> nonce_buf = args[1]->ToObject();
Local<Object> block_template_buf = info[0]->ToObject();
Local<Object> nonce_buf = info[1]->ToObject();

uint64_t mergedMiningBlockVersion = BLOCK_MAJOR_VERSION_2;
if (args.Length() >= 3) {
Expand Down Expand Up @@ -191,18 +194,18 @@ NAN_METHOD(construct_block_blob) {
if (!block_to_blob(b, output, b.major_version >= mergedMiningBlockVersion))
return THROW_ERROR_EXCEPTION("Failed to convert block to blob");

NanReturnValue(
NanNewBufferHandle(output.data(), output.size())
v8::Local<v8::Value> returnValue = Nan::CopyBuffer((char*)output.data(), output.size()).ToLocalChecked();
info.GetReturnValue().Set(
returnValue
);
}

NAN_METHOD(convert_blob_bb) {
NanScope();
void convert_blob_bb(const Nan::FunctionCallbackInfo<v8::Value>& info) {

if (args.Length() < 1)
if (info.Length() < 1)
return THROW_ERROR_EXCEPTION("You must provide one argument.");

Local<Object> target = args[0]->ToObject();
Local<Object> target = info[0]->ToObject();

if (!Buffer::HasInstance(target))
return THROW_ERROR_EXCEPTION("Argument should be a buffer object.");
Expand All @@ -217,18 +220,18 @@ NAN_METHOD(convert_blob_bb) {
}
output = get_block_hashing_blob(b);

NanReturnValue(
NanNewBufferHandle(output.data(), output.size())
v8::Local<v8::Value> returnValue = Nan::CopyBuffer((char*)output.data(), output.size()).ToLocalChecked();
info.GetReturnValue().Set(
returnValue
);
}

NAN_METHOD(address_decode) {
NanEscapableScope();
void address_decode(const Nan::FunctionCallbackInfo<v8::Value>& info) {

if (args.Length() < 1)
if (info.Length() < 1)
return THROW_ERROR_EXCEPTION("You must provide one argument.");

Local<Object> target = args[0]->ToObject();
Local<Object> target = info[0]->ToObject();

if (!Buffer::HasInstance(target))
return THROW_ERROR_EXCEPTION("Argument should be a buffer object.");
Expand All @@ -238,16 +241,16 @@ NAN_METHOD(address_decode) {
blobdata data;
uint64_t prefix;
if (!tools::base58::decode_addr(input, prefix, data))
NanReturnUndefined();
info.GetReturnValue().Set(Nan::Undefined());

account_public_address adr;
if (!::serialization::parse_binary(data, adr))
NanReturnUndefined();
info.GetReturnValue().Set(Nan::Undefined());

if (!crypto::check_key(adr.m_spend_public_key) || !crypto::check_key(adr.m_view_public_key))
NanReturnUndefined();
info.GetReturnValue().Set(Nan::Undefined());

NanReturnValue(NanNew(static_cast<uint32_t>(prefix)));
info.GetReturnValue().Set(Nan::New(static_cast<uint32_t>(prefix)));
}

NAN_METHOD(cryptonight) {
Expand Down Expand Up @@ -280,13 +283,13 @@ NAN_METHOD(cryptonight) {
info.GetReturnValue().Set(Nan::NewBuffer(output, 32).ToLocalChecked());
}

void init(Handle<Object> exports) {
exports->Set(NanNew<String>("construct_block_blob"), NanNew<FunctionTemplate>(construct_block_blob)->GetFunction());
exports->Set(NanNew<String>("get_block_id"), NanNew<FunctionTemplate>(get_block_id)->GetFunction());
exports->Set(NanNew<String>("convert_blob"), NanNew<FunctionTemplate>(convert_blob)->GetFunction());
exports->Set(NanNew<String>("convert_blob_bb"), NanNew<FunctionTemplate>(convert_blob_bb)->GetFunction());
exports->Set(NanNew<String>("address_decode"), NanNew<FunctionTemplate>(address_decode)->GetFunction());
exports->Set(NanNew<String>("cryptonight"), NanNew<FunctionTemplate>(cryptonight)->GetFunction());
NAN_MODULE_INIT(init) {
Nan::Set(target, Nan::New("construct_block_blob").ToLocalChecked(), Nan::GetFunction(Nan::New<FunctionTemplate>(construct_block_blob)).ToLocalChecked());
Nan::Set(target, Nan::New("get_block_id").ToLocalChecked(), Nan::GetFunction(Nan::New<FunctionTemplate>(get_block_id)).ToLocalChecked());
Nan::Set(target, Nan::New("convert_blob").ToLocalChecked(), Nan::GetFunction(Nan::New<FunctionTemplate>(convert_blob)).ToLocalChecked());
Nan::Set(target, Nan::New("convert_blob_bb").ToLocalChecked(), Nan::GetFunction(Nan::New<FunctionTemplate>(convert_blob_bb)).ToLocalChecked());
Nan::Set(target, Nan::New("address_decode").ToLocalChecked(), Nan::GetFunction(Nan::New<FunctionTemplate>(address_decode)).ToLocalChecked());
Nan::Set(target, Nan::New("cryptonight").ToLocalChecked(), Nan::GetFunction(Nan::New<FunctionTemplate>(cryptonight)).ToLocalChecked());
}

NODE_MODULE(cryptonote, init)

0 comments on commit 2b2de8f

Please sign in to comment.