diff --git a/.travis.yml b/.travis.yml index e2df2e3b..97c0df3c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ env: - BITCORENODE_ENV=test BITCORENODE_ASSUME_YES=true node_js: - "v0.12.7" + - "v4" before_install: - git config --global user.email "dev@bitpay.com" - git config --global user.name "BitPay, Inc." diff --git a/binding.gyp b/binding.gyp index 99a5cab0..3db1adb1 100644 --- a/binding.gyp +++ b/binding.gyp @@ -48,8 +48,7 @@ "GetIsolate(); + Isolate* isolate = Isolate::GetCurrent(); HandleScope scope(isolate); Local results = Array::New(isolate); @@ -273,7 +273,7 @@ tx_notifier(uv_async_t *handle) { CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION); ssTx << tx; std::string stx = ssTx.str(); - Nan::MaybeLocal txBuffer = Nan::NewBuffer((char *)stx.c_str(), stx.size()); + Nan::MaybeLocal txBuffer = Nan::CopyBuffer((char *)stx.c_str(), stx.size()); uint256 hash = tx.GetHash(); @@ -1039,7 +1039,7 @@ async_get_tx_after(uv_work_t *r) { CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION); ssTx << ctx; std::string stx = ssTx.str(); - Nan::MaybeLocal result = Nan::NewBuffer((char *)stx.c_str(), stx.size()); + Nan::MaybeLocal result = Nan::CopyBuffer((char *)stx.c_str(), stx.size()); Local argv[2] = { Local::New(isolate, Null()), result.ToLocalChecked() @@ -1185,7 +1185,7 @@ async_get_tx_and_info_after(uv_work_t *r) { CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION); ssTx << ctx; std::string stx = ssTx.str(); - Nan::MaybeLocal rawNodeBuffer = Nan::NewBuffer((char *)stx.c_str(), stx.size()); + Nan::MaybeLocal rawNodeBuffer = Nan::CopyBuffer((char *)stx.c_str(), stx.size()); Nan::Set(obj, New("blockHash").ToLocalChecked(), New(req->blockHash).ToLocalChecked()); Nan::Set(obj, New("height").ToLocalChecked(), New(req->height)); @@ -1462,7 +1462,7 @@ NAN_METHOD(GetMempoolTransactions) { CDataStream dataStreamTx(SER_NETWORK, PROTOCOL_VERSION); dataStreamTx << tx; std::string txString = dataStreamTx.str(); - Nan::MaybeLocal txBuffer = Nan::NewBuffer((char *)txString.c_str(), txString.size()); + Nan::MaybeLocal txBuffer = Nan::CopyBuffer((char *)txString.c_str(), txString.size()); transactions->Set(arrayIndex, txBuffer.ToLocalChecked()); arrayIndex++; } @@ -1510,7 +1510,6 @@ set_cooked(void) { * Init() * Initialize the singleton object known as bitcoind. */ - NAN_MODULE_INIT(init) { Nan::Set(target, New("start").ToLocalChecked(), GetFunction(New(StartBitcoind)).ToLocalChecked()); Nan::Set(target, New("onBlocksReady").ToLocalChecked(), GetFunction(New(OnBlocksReady)).ToLocalChecked());