Compare commits
9 Commits
Author | SHA1 | Date |
---|---|---|
Harald Wolff | 3f2b2ce73a | |
Harald Wolff | 48ac60139f | |
clintar | 594ecbaf33 | |
clintar | 7551044f8a | |
clintar | 25db84cdf0 | |
clintar | 4e798b9025 | |
clintar | 9e81febac8 | |
Petar Mitchev | 1138e27ea3 | |
Petar Mitchev | e5ac040561 |
38
package.json
38
package.json
|
@ -1,21 +1,21 @@
|
|||
{
|
||||
"name": "cryptonote-util",
|
||||
"version": "0.0.1",
|
||||
"main": "cryptonote",
|
||||
"author": {
|
||||
"name": "LucasJones",
|
||||
"email": "lucasjonesdev@hotmail.co.uk"
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/LucasJones/node-cryptonote-util.git"
|
||||
},
|
||||
"dependencies" : {
|
||||
"bindings" : "*",
|
||||
"nan" : "1"
|
||||
},
|
||||
"keywords": [
|
||||
"cryptonight",
|
||||
"cryptonote"
|
||||
]
|
||||
"name": "cryptonote-util",
|
||||
"version": "0.0.1",
|
||||
"main": "cryptonote",
|
||||
"author": {
|
||||
"name": "LucasJones",
|
||||
"email": "lucasjonesdev@hotmail.co.uk"
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/clintar/node-cryptonote-util.git"
|
||||
},
|
||||
"dependencies": {
|
||||
"bindings": "*",
|
||||
"nan": "^2.0.0"
|
||||
},
|
||||
"keywords": [
|
||||
"cryptonight",
|
||||
"cryptonote"
|
||||
]
|
||||
}
|
||||
|
|
|
@ -221,7 +221,7 @@ DISABLE_VS_WARNINGS(4200)
|
|||
POP_WARNINGS
|
||||
|
||||
static inline size_t rs_comm_size(size_t pubs_count) {
|
||||
return sizeof(rs_comm) + pubs_count * sizeof(rs_comm().ab[0]);
|
||||
return sizeof(rs_comm) + pubs_count * sizeof(((rs_comm*)0)->ab[0]);
|
||||
}
|
||||
|
||||
void crypto_ops::generate_ring_signature(const hash &prefix_hash, const key_image &image,
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
|
||||
#define BLOCK_MAJOR_VERSION_1 1
|
||||
#define BLOCK_MAJOR_VERSION_2 2
|
||||
#define BLOCK_MAJOR_VERSION_3 3
|
||||
|
||||
#define COIN ((uint64_t)100000000) // pow(10, 8)
|
||||
#define DEFAULT_FEE ((uint64_t)1000000) // pow(10, 6)
|
||||
|
|
|
@ -456,7 +456,7 @@ namespace cryptonote
|
|||
|
||||
BEGIN_SERIALIZE()
|
||||
VARINT_FIELD(major_version)
|
||||
if(major_version > BLOCK_MAJOR_VERSION_2) return false;
|
||||
if(major_version > BLOCK_MAJOR_VERSION_3) return false;
|
||||
VARINT_FIELD(minor_version)
|
||||
if (BLOCK_MAJOR_VERSION_1 == major_version)
|
||||
{
|
||||
|
|
|
@ -860,7 +860,7 @@ namespace cryptonote
|
|||
//---------------------------------------------------------------
|
||||
bool check_proof_of_work_v2(const block& bl, difficulty_type current_diffic, crypto::hash& proof_of_work)
|
||||
{
|
||||
if (BLOCK_MAJOR_VERSION_2 != bl.major_version)
|
||||
if (BLOCK_MAJOR_VERSION_2 != bl.major_version || BLOCK_MAJOR_VERSION_3 != bl.major_version)
|
||||
return false;
|
||||
|
||||
if (!get_bytecoin_block_longhash(bl, proof_of_work))
|
||||
|
@ -900,6 +900,7 @@ namespace cryptonote
|
|||
{
|
||||
case BLOCK_MAJOR_VERSION_1: return check_proof_of_work_v1(bl, current_diffic, proof_of_work);
|
||||
case BLOCK_MAJOR_VERSION_2: return check_proof_of_work_v2(bl, current_diffic, proof_of_work);
|
||||
case BLOCK_MAJOR_VERSION_3: return check_proof_of_work_v2(bl, current_diffic, proof_of_work);
|
||||
}
|
||||
|
||||
CHECK_AND_ASSERT_MES(false, false, "unknown block major version: " << bl.major_version << "." << bl.minor_version);
|
||||
|
|
126
src/main.cc
126
src/main.cc
|
@ -14,9 +14,12 @@
|
|||
#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;
|
||||
using namespace cryptonote;
|
||||
|
@ -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();
|
||||
|
||||
if (!Buffer::HasInstance(target))
|
||||
return THROW_ERROR_EXCEPTION("Argument should be a buffer object.");
|
||||
|
@ -107,19 +109,24 @@ NAN_METHOD(convert_blob) {
|
|||
if (!get_block_hashing_blob(parent_block, output))
|
||||
return THROW_ERROR_EXCEPTION("Failed to create mining block");
|
||||
}
|
||||
|
||||
NanReturnValue(
|
||||
NanNewBufferHandle(output.data(), output.size())
|
||||
// Local<Object> v8::Local<v8::Value> returnValue = Nan::NewBuffer(output.length()).ToLocalChecked();
|
||||
// memcpy(Buffer::Data(returnValue), output.c_str(), output.length());
|
||||
// info.GetReturnValue().Set(
|
||||
// returnValue
|
||||
// );
|
||||
|
||||
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();
|
||||
|
||||
if (!Buffer::HasInstance(target))
|
||||
return THROW_ERROR_EXCEPTION("Argument should be a buffer object.");
|
||||
|
@ -134,20 +141,21 @@ NAN_METHOD(get_block_id) {
|
|||
crypto::hash block_id;
|
||||
if (!get_block_hash(b, block_id))
|
||||
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();
|
||||
|
||||
if (!Buffer::HasInstance(block_template_buf) || !Buffer::HasInstance(nonce_buf))
|
||||
return THROW_ERROR_EXCEPTION("Both arguments should be buffer objects.");
|
||||
|
@ -174,22 +182,31 @@ NAN_METHOD(construct_block_blob) {
|
|||
if (!mergeBlocks(parent_block, b, std::vector<crypto::hash>()))
|
||||
return THROW_ERROR_EXCEPTION("Failed to postprocess mining block");
|
||||
}
|
||||
if (b.major_version == BLOCK_MAJOR_VERSION_3) {
|
||||
block parent_block;
|
||||
b.parent_block.nonce = nonce;
|
||||
if (!construct_parent_block(b, parent_block))
|
||||
return THROW_ERROR_EXCEPTION("Failed to construct parent block");
|
||||
|
||||
if (!mergeBlocks(parent_block, b, std::vector<crypto::hash>()))
|
||||
return THROW_ERROR_EXCEPTION("Failed to postprocess mining block");
|
||||
}
|
||||
|
||||
if (!block_to_blob(b, output))
|
||||
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.");
|
||||
|
@ -204,18 +221,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.");
|
||||
|
@ -225,24 +242,41 @@ NAN_METHOD(address_decode) {
|
|||
blobdata data;
|
||||
uint64_t prefix;
|
||||
if (!tools::base58::decode_addr(input, prefix, data))
|
||||
NanReturnUndefined();
|
||||
{
|
||||
info.GetReturnValue().Set(Nan::Undefined());
|
||||
}
|
||||
// info.GetReturnValue().Set(Nan::Undefined());
|
||||
|
||||
|
||||
account_public_address adr;
|
||||
if (!::serialization::parse_binary(data, adr))
|
||||
NanReturnUndefined();
|
||||
if (!::serialization::parse_binary(data, adr) || !crypto::check_key(adr.m_spend_public_key) || !crypto::check_key(adr.m_view_public_key))
|
||||
{
|
||||
if(data.length())
|
||||
{
|
||||
data = uint64be_to_blob(prefix) + data;
|
||||
}
|
||||
else
|
||||
{
|
||||
info.GetReturnValue().Set(Nan::Undefined());
|
||||
}
|
||||
v8::Local<v8::Value> returnValue = Nan::CopyBuffer((char*)data.data(), data.size()).ToLocalChecked();
|
||||
info.GetReturnValue().Set(
|
||||
returnValue
|
||||
);
|
||||
|
||||
if (!crypto::check_key(adr.m_spend_public_key) || !crypto::check_key(adr.m_view_public_key))
|
||||
NanReturnUndefined();
|
||||
|
||||
NanReturnValue(NanNew(static_cast<uint32_t>(prefix)));
|
||||
}
|
||||
else
|
||||
{
|
||||
info.GetReturnValue().Set(Nan::New(static_cast<uint32_t>(prefix)));
|
||||
}
|
||||
}
|
||||
|
||||
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());
|
||||
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());
|
||||
}
|
||||
|
||||
NODE_MODULE(cryptonote, init)
|
||||
|
|
Loading…
Reference in New Issue