Skip to content

Commit 213e711

Browse files
authored
fix node modules version for electron (#148)
Electron uses NODE_MODULE_VERSION between 67 and 72. Previous used condition NODE_MODULE_VERSION > NODE_11_0_MODULE_VERSION broke building for Electron.
1 parent bce4af7 commit 213e711

4 files changed

Lines changed: 7 additions & 7 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"create-hash": "^1.2.0",
5454
"drbg.js": "^1.0.1",
5555
"elliptic": "^6.4.1",
56-
"nan": "^2.13.2",
56+
"nan": "^2.14.0",
5757
"safe-buffer": "^5.1.2"
5858
},
5959
"devDependencies": {

src/ecdsa.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ int nonce_function_custom(unsigned char *nonce32, const unsigned char *msg32, co
1919
};
2020

2121
v8::Isolate *isolate = v8::Isolate::GetCurrent();
22-
#if (NODE_MODULE_VERSION > NODE_11_0_MODULE_VERSION)
22+
#if (NODE_MODULE_VERSION >= NODE_12_0_MODULE_VERSION)
2323
v8::Local<v8::Value> result = noncefn_callback->Call(isolate->GetCurrentContext(), isolate->GetCurrentContext()->Global(), 5, argv).ToLocalChecked();
2424
#else
2525
v8::Local<v8::Value> result = noncefn_callback->Call(isolate->GetCurrentContext()->Global(), 5, argv);
@@ -52,7 +52,7 @@ NAN_METHOD(sign) {
5252
if (!options->IsUndefined()) {
5353
CHECK_TYPE_OBJECT(options, OPTIONS_TYPE_INVALID);
5454

55-
#if (NODE_MODULE_VERSION > NODE_11_0_MODULE_VERSION)
55+
#if (NODE_MODULE_VERSION >= NODE_12_0_MODULE_VERSION)
5656
v8::Local<v8::Value> data_value = options->Get(info.GetIsolate()->GetCurrentContext(), Nan::New<v8::String>("data").ToLocalChecked()).ToLocalChecked();
5757
#else
5858
v8::Local<v8::Value> data_value = options->Get(Nan::New<v8::String>("data").ToLocalChecked());
@@ -63,7 +63,7 @@ NAN_METHOD(sign) {
6363
data = (void*) node::Buffer::Data(data_value);
6464
}
6565

66-
#if (NODE_MODULE_VERSION > NODE_11_0_MODULE_VERSION)
66+
#if (NODE_MODULE_VERSION >= NODE_12_0_MODULE_VERSION)
6767
noncefn_callback = v8::Local<v8::Function>::Cast(options->Get(info.GetIsolate()->GetCurrentContext(), Nan::New<v8::String>("noncefn").ToLocalChecked()).ToLocalChecked());
6868
#else
6969
noncefn_callback = v8::Local<v8::Function>::Cast(options->Get(Nan::New<v8::String>("noncefn").ToLocalChecked()));
@@ -84,7 +84,7 @@ NAN_METHOD(sign) {
8484
secp256k1_ecdsa_recoverable_signature_serialize_compact(secp256k1ctx, &output[0], &recid, &sig);
8585

8686
v8::Local<v8::Object> obj = Nan::New<v8::Object>();
87-
#if (NODE_MODULE_VERSION > NODE_11_0_MODULE_VERSION)
87+
#if (NODE_MODULE_VERSION >= NODE_12_0_MODULE_VERSION)
8888
obj->Set(info.GetIsolate()->GetCurrentContext(), Nan::New<v8::String>("signature").ToLocalChecked(), COPY_BUFFER(&output[0], 64));
8989
obj->Set(info.GetIsolate()->GetCurrentContext(), Nan::New<v8::String>("recovery").ToLocalChecked(), Nan::New<v8::Number>(recid));
9090
#else

src/publickey.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ NAN_METHOD(publicKeyCombine) {
143143
std::unique_ptr<secp256k1_pubkey[]> public_keys(new secp256k1_pubkey[input_buffers->Length()]);
144144
std::unique_ptr<secp256k1_pubkey*[]> ins(new secp256k1_pubkey*[input_buffers->Length()]);
145145
for (unsigned int i = 0; i < input_buffers->Length(); ++i) {
146-
#if (NODE_MODULE_VERSION > NODE_11_0_MODULE_VERSION)
146+
#if (NODE_MODULE_VERSION >= NODE_12_0_MODULE_VERSION)
147147
v8::Local<v8::Object> public_key_buffer = v8::Local<v8::Object>::Cast(input_buffers->Get(info.GetIsolate()->GetCurrentContext(), i).ToLocalChecked());
148148
#else
149149
v8::Local<v8::Object> public_key_buffer = v8::Local<v8::Object>::Cast(input_buffers->Get(i));

src/util.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
#define COPY_BUFFER(data, datalen) Nan::CopyBuffer((const char*) data, (uint32_t) datalen).ToLocalChecked()
1010

11-
#if (NODE_MODULE_VERSION > NODE_11_0_MODULE_VERSION)
11+
#if (NODE_MODULE_VERSION >= NODE_12_0_MODULE_VERSION)
1212
#define UPDATE_COMPRESSED_VALUE(compressed, value, v_true, v_false) { \
1313
if (!value->IsUndefined()) { \
1414
CHECK_TYPE_BOOLEAN(value, COMPRESSED_TYPE_INVALID); \

0 commit comments

Comments
 (0)